Merge branch 'ci-artifacts-options' into 'master'

Expose artifacts options in omnibus package

Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1869

It also creates directory for `/artifacts` and `/lfs-objects`.


See merge request !544

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

@@ -62,6 +62,10 @@ external_url 'GENERATED_EXTERNAL_URL'
 #
 # gitlab_rails['incoming_email_log_directory'] = "/var/log/gitlab/mailroom"
 
+## Build Artifacts
+# gitlab_rails['artifacts_enabled'] = true
+# gitlab_rails['artifacts_path'] = "/mnt/storage/artifacts"
+
 ## Git LFS
 # gitlab_rails['lfs_enabled'] = true
 # gitlab_rails['lfs_storage_path'] = "/mnt/storage/lfs-objects"

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

@@ -94,6 +94,8 @@ default['gitlab']['gitlab-rails']['incoming_email_start_tls'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_email'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_password'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_mailbox_name'] = nil
+default['gitlab']['gitlab-rails']['artifacts_enabled'] = true
+default['gitlab']['gitlab-rails']['artifacts_path'] = nil
 default['gitlab']['gitlab-rails']['lfs_enabled'] = false
 default['gitlab']['gitlab-rails']['lfs_storage_path'] = nil
 default['gitlab']['gitlab-rails']['ldap_enabled'] = false

files/gitlab-cookbooks/gitlab/libraries/gitlab.rb

@@ -151,6 +151,18 @@ module Gitlab
       Gitlab['gitlab_rails']['satellites_path'] ||= File.join(git_data_dir, "gitlab-satellites")
     end
 
+    def parse_shared_dir
+      Gitlab['gitlab_rails']['shared_path'] ||= node['gitlab']['gitlab']['shared_path']
+    end
+
+    def parse_artifacts_dir
+      Gitlab['gitlab_rails']['artifacts_path'] ||= File.join(Gitlab['gitlab_rails']['shared_path'], 'artifacts')
+    end
+
+    def parse_lfs_objects_dir
+      Gitlab['gitlab_rails']['lfs_storage_path'] ||= File.join(Gitlab['gitlab_rails']['shared_path'], 'lfs-objects')
+    end
+
     def parse_udp_log_shipping
       return unless logging['udp_log_shipping_host']
 
@@ -420,6 +432,9 @@ module Gitlab
       parse_gitlab_git_http_server
       parse_external_url
       parse_git_data_dir
+      parse_shared_dir
+      parse_artifacts_dir
+      parse_lfs_objects_dir
       parse_udp_log_shipping
       parse_redis_settings
       parse_postgresql_settings

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

@@ -45,6 +45,8 @@ gitlab_group = account_helper.gitlab_group
   node['gitlab']['gitlab-rails']['backup_path'],
   node['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'],
   node['gitlab']['gitlab-rails']['shared_path'],
+  node['gitlab']['gitlab-rails']['artifacts_path'],
+  node['gitlab']['gitlab-rails']['lfs_storage_path'],
   gitlab_rails_log_dir
 ].compact.each do |dir_name|
   directory dir_name do

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

@@ -107,6 +107,12 @@ production: &base
     # The mailbox where incoming mail will end up. Usually "inbox".
     mailbox: <%= single_quote(@incoming_email_mailbox_name) %>
 
+  ## Build Artifacts
+  artifacts:
+    enabled: <%= @artifacts_enabled %>
+    # The location where Build Artifacts are stored (default: shared/artifacts).
+    storage_path: <%= @artifacts_path %>
+
   ## Git LFS
   lfs:
     enabled: <%= @lfs_enabled %>