lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb in gitlab-qa-7.27.1 vs lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb in gitlab-qa-7.27.2
- old
+ new
@@ -3,24 +3,22 @@
module Gitlab
module QA
module Runtime
module OmnibusConfigurations
class ObjectStorage < Default
- TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy].freeze
+ TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages].freeze
def configuration
- TYPES.each_with_object(+'') do |object_type, omnibus|
+ config = TYPES.each_with_object(+'') do |object_type, omnibus|
omnibus << <<~OMNIBUS
- gitlab_rails['#{object_type}_enabled'] = true
- gitlab_rails['#{object_type}_storage_path'] = '/var/opt/gitlab/gitlab-rails/shared/#{object_type}'
- gitlab_rails['#{object_type}_object_store_enabled'] = true
- gitlab_rails['#{object_type}_object_store_remote_directory'] = '#{object_type}-bucket'
- gitlab_rails['#{object_type}_object_store_background_upload'] = false
- gitlab_rails['#{object_type}_object_store_direct_upload'] = true
- gitlab_rails['#{object_type}_object_store_proxy_download'] = true
- gitlab_rails['#{object_type}_object_store_connection'] = #{minio.to_config}
+ gitlab_rails['object_store']['objects']['#{object_type}']['bucket'] = '#{object_type}-bucket'
OMNIBUS
end
+ config << <<~OMNIBUS
+ gitlab_rails['object_store']['enabled'] = true
+ gitlab_rails['object_store']['proxy_download'] = true
+ gitlab_rails['object_store']['connection'] = #{minio.to_config}
+ OMNIBUS
end
def prepare
minio.network = 'test'