Merge branch 'builds_dir_for_ci' into 'master'

Add builds directory configuration for GitLab CI.

Fixes #659

See merge request !407

config/software/gitlab-ci.rb

@@ -57,6 +57,7 @@ build do
   # Remove directories that will be created by `gitlab-ctl reconfigure`
   delete 'log'
   delete 'tmp'
+  delete 'builds'
 
   # Because db/schema.rb is modified by `rake db:migrate` after installation,
   # keep a copy of schema.rb around in case we need it. (I am looking at you,

files/gitlab-config-template/gitlab.rb.template

@@ -441,6 +441,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_ci['gitlab_ci_support_email'] = 'gitlab-ci@example.com'
 # gitlab_ci['gitlab_ci_all_broken_builds'] = true
 # gitlab_ci['gitlab_ci_add_pusher'] = true
+# gitlab_ci['builds_directory'] = '/var/opt/gitlab/gitlab-ci/builds'
 
 # gitlab_ci['gravatar_enabled'] = true
 # gitlab_ci['gravatar_plain_url'] = "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -394,6 +394,7 @@ default['gitlab']['high-availability']['mountpoint'] = nil
 default['gitlab']['gitlab-ci']['enable'] = false
 default['gitlab']['gitlab-ci']['dir'] = "/var/opt/gitlab/gitlab-ci"
 default['gitlab']['gitlab-ci']['log_directory'] = "/var/log/gitlab/gitlab-ci"
+default['gitlab']['gitlab-ci']['builds_directory'] = "/var/opt/gitlab/gitlab-ci/builds"
 default['gitlab']['gitlab-ci']['environment'] = 'production'
 default['gitlab']['gitlab-ci']['env'] = {
   # Path the the GitLab CI Gemfile

files/gitlab-cookbooks/gitlab/recipes/gitlab-ci.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+package_install_dir = node['package']['install-dir']
 gitlab_ci_source_dir = "/opt/gitlab/embedded/service/gitlab-ci"
 gitlab_ci_dir = node['gitlab']['gitlab-ci']['dir']
 gitlab_ci_home_dir = File.join(gitlab_ci_dir, "home")
@@ -24,6 +25,7 @@ gitlab_ci_static_etc_dir = "/opt/gitlab/etc/gitlab-ci"
 gitlab_ci_working_dir = File.join(gitlab_ci_dir, "working")
 gitlab_ci_tmp_dir = File.join(gitlab_ci_dir, "tmp")
 gitlab_ci_log_dir = node['gitlab']['gitlab-ci']['log_directory']
+gitlab_ci_builds_dir = node['gitlab']['gitlab-ci']['builds_directory']
 
 gitlab_ci_user = node['gitlab']['gitlab-ci']['username']
 gitlab_app = "gitlab-ci"
@@ -48,7 +50,8 @@ end
   gitlab_ci_working_dir,
   gitlab_ci_tmp_dir,
   node['gitlab']['gitlab-ci']['backup_path'],
-  gitlab_ci_log_dir
+  gitlab_ci_log_dir,
+  gitlab_ci_builds_dir
 ].compact.each do |dir_name|
   directory dir_name do
     owner gitlab_ci_user
@@ -167,8 +170,9 @@ end
 
 # replace empty directories in the Git repo with symlinks to /var/opt/gitlab
 {
-  "/opt/gitlab/embedded/service/gitlab-ci/tmp" => gitlab_ci_tmp_dir,
-  "/opt/gitlab/embedded/service/gitlab-ci/log" => gitlab_ci_log_dir
+  "#{package_install_dir}/embedded/service/gitlab-ci/tmp" => gitlab_ci_tmp_dir,
+  "#{package_install_dir}/embedded/service/gitlab-ci/log" => gitlab_ci_log_dir,
+  "#{package_install_dir}/embedded/service/gitlab-ci/builds" => gitlab_ci_builds_dir
 }.each do |link_dir, target_dir|
   link link_dir do
     to target_dir

files/gitlab-cookbooks/gitlab/templates/default/application.yml.erb

@@ -24,6 +24,8 @@ defaults: &defaults
     # Add committer to recipients list (default: false)
     add_pusher: <%= @gitlab_ci_add_pusher || @gitlab_ci_add_committer %>
 
+    builds_path: <%= @builds_directory %>
+
   gravatar:
     enabled: <%= @gravatar_enabled %>
     plain_url: <%= single_quote(@gravatar_plain_url) %>