gitlab-qa 6.22.0 → 7.0.2

data/lib/gitlab/qa/scenario/test/integration/kubernetes.rb

@@ -21,7 +21,7 @@ module Gitlab
                     tunnel_registry.gitlab_hostname = gitlab.hostname
                     tunnel_registry.network = 'test'
 
-                    gitlab.omnibus_config = <<~OMNIBUS
+                    gitlab.omnibus_configuration << <<~OMNIBUS
                       external_url '#{tunnel_gitlab.url}';
                       nginx['listen_port'] = 80;
                       nginx['listen_https'] = false;

data/lib/gitlab/qa/scenario/test/integration/ldap.rb

@@ -27,7 +27,7 @@ module Gitlab
             end
 
             def ldap_servers_omnibus_config
-              config = YAML.safe_load <<~CFG
+              YAML.safe_load <<~CFG
                 main:
                   label: LDAP
                   host: #{ldap_hostname}
@@ -44,9 +44,6 @@ module Gitlab
                   external_groups: ''
                   sync_ssh_keys: false
               CFG
-
-              # Quotes get eaten up when the string is set in the environment
-              config.to_s.gsub("\"", "\\\"")
             end
 
             def ldap_hostname

data/lib/gitlab/qa/scenario/test/integration/ldap_no_server.rb

@@ -12,7 +12,7 @@ module Gitlab
             end
 
             def configure_omnibus(gitlab)
-              gitlab.omnibus_config = <<~OMNIBUS
+              gitlab.omnibus_configuration << <<~OMNIBUS
                     gitlab_rails['ldap_enabled'] = true;
                     gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};
                     gitlab_rails['ldap_sync_worker_cron'] = '* * * * *';

data/lib/gitlab/qa/scenario/test/integration/ldap_no_tls.rb

@@ -15,7 +15,7 @@ module Gitlab
             end
 
             def configure_omnibus(gitlab)
-              gitlab.omnibus_config = <<~OMNIBUS
+              gitlab.omnibus_configuration << <<~OMNIBUS
                     gitlab_rails['ldap_enabled'] = true;
                     gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};
                     gitlab_rails['ldap_sync_worker_cron'] = '* * * * *';

data/lib/gitlab/qa/scenario/test/integration/ldap_tls.rb

@@ -15,7 +15,7 @@ module Gitlab
             end
 
             def configure_omnibus(gitlab)
-              gitlab.omnibus_config = <<~OMNIBUS
+              gitlab.omnibus_configuration << <<~OMNIBUS
                     gitlab_rails['ldap_enabled'] = true;
                     gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};
                     letsencrypt['enable'] = false;

data/lib/gitlab/qa/scenario/test/integration/mattermost.rb

@@ -13,7 +13,7 @@ module Gitlab
                 mattermost_external_url = "http://#{mattermost_hostname}"
 
                 gitlab.add_network_alias(mattermost_hostname)
-                gitlab.omnibus_config = <<~OMNIBUS
+                gitlab.omnibus_configuration << <<~OMNIBUS
                   mattermost_external_url '#{mattermost_external_url}';
                 OMNIBUS
 

data/lib/gitlab/qa/scenario/test/integration/mtls.rb

@@ -21,7 +21,7 @@ module Gitlab
                 gitaly.network = @network
                 gitaly.skip_availability_check = true
 
-                gitaly.omnibus_config = gitaly_omnibus
+                gitaly.omnibus_configuration << gitaly_omnibus
                 gitaly.gitaly_tls
 
                 gitaly.instance do
@@ -30,7 +30,7 @@ module Gitlab
                     gitlab.name = @gitlab_name
                     gitlab.network = @network
 
-                    gitlab.omnibus_config = gitlab_omnibus
+                    gitlab.omnibus_configuration << gitlab_omnibus
                     gitlab.tls = true
 
                     gitlab.instance do

data/lib/gitlab/qa/scenario/test/integration/smtp.rb

@@ -14,7 +14,7 @@ module Gitlab
             attr_reader :gitlab_name, :spec_suite
 
             def configure_omnibus(gitlab, mail_hog)
-              gitlab.omnibus_config = <<~OMNIBUS
+              gitlab.omnibus_configuration << <<~OMNIBUS
                     gitlab_rails['smtp_enable'] = true;
                     gitlab_rails['smtp_address'] = '#{mail_hog.hostname}';
                     gitlab_rails['smtp_port'] = 1025;

data/lib/gitlab/qa/scenario/test/integration/ssh_tunnel.rb

@@ -22,7 +22,7 @@ module Gitlab
                     tunnel_registry.gitlab_hostname = gitlab.hostname
                     tunnel_registry.network = 'test'
 
-                    gitlab.omnibus_config = <<~OMNIBUS
+                    gitlab.omnibus_configuration << <<~OMNIBUS
                       external_url '#{tunnel_gitlab.url}';
                       nginx['listen_port'] = 80;
                       nginx['listen_https'] = false;

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.22.0'.freeze
+    VERSION = '7.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.22.0
+  version: 7.0.2
 platform: ruby
 authors:
-- Grzegorz Bizon
+- GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -184,17 +184,17 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 1.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 1.5.7
 description: 
 email:
-- grzesiek.bizon@gmail.com
+- gitlab-qa@gmail.com
 executables:
 - gitlab-qa
 - gitlab-qa-report
@@ -221,6 +221,7 @@ files:
 - bin/slack
 - docs/README.md
 - docs/architecture.md
+- docs/configuring_omnibus.md
 - docs/how_it_works.md
 - docs/release_process.md
 - docs/run_qa_against_gdk.md
@@ -273,6 +274,10 @@ files:
 - lib/gitlab/qa/reporter.rb
 - lib/gitlab/qa/runner.rb
 - lib/gitlab/qa/runtime/env.rb
+- lib/gitlab/qa/runtime/omnibus_configuration.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/default.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/packages.rb
 - lib/gitlab/qa/runtime/scenario.rb
 - lib/gitlab/qa/runtime/token_finder.rb
 - lib/gitlab/qa/scenario/actable.rb
@@ -305,8 +310,6 @@ files:
 - lib/gitlab/qa/scenario/test/integration/ldap_tls.rb
 - lib/gitlab/qa/scenario/test/integration/mattermost.rb
 - lib/gitlab/qa/scenario/test/integration/mtls.rb
-- lib/gitlab/qa/scenario/test/integration/object_storage.rb
-- lib/gitlab/qa/scenario/test/integration/packages.rb
 - lib/gitlab/qa/scenario/test/integration/praefect.rb
 - lib/gitlab/qa/scenario/test/integration/saml.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
@@ -330,7 +333,7 @@ files:
 - tls_certificates/gitlab/gitlab.test.crt
 - tls_certificates/gitlab/gitlab.test.csr
 - tls_certificates/gitlab/gitlab.test.key
-homepage: http://about.gitlab.com
+homepage: http://about.gitlab.com/
 licenses:
 - MIT
 metadata: {}

data/lib/gitlab/qa/scenario/test/integration/object_storage.rb

@@ -1,64 +0,0 @@
-require 'yaml'
-
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class ObjectStorage < Scenario::Template
-            include Scenario::CLICommands
-
-            TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy].freeze
-
-            def perform(release, *rspec_args)
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = release
-                gitlab.name = 'gitlab-object-storage'
-                gitlab.network = 'test'
-
-                Component::Minio.perform do |minio|
-                  minio.network = 'test'
-
-                  TYPES.each do |bucket_name|
-                    minio.add_bucket("#{bucket_name}-bucket")
-                  end
-
-                  gitlab.omnibus_config = object_storage_config(minio)
-                  gitlab.exec_commands = git_lfs_install_commands
-
-                  minio.instance do
-                    gitlab.instance do
-                      puts 'Running object storage specs!'
-
-                      Component::Specs.perform do |specs|
-                        specs.suite = 'Test::Integration::ObjectStorage'
-                        specs.release = gitlab.release
-                        specs.network = gitlab.network
-                        specs.args = [gitlab.address, *rspec_args]
-                      end
-                    end
-                  end
-                end
-              end
-            end
-
-            def object_storage_config(minio)
-              TYPES.map do |object_type|
-                <<~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};
-                OMNIBUS
-              end.join("\n")
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/gitlab/qa/scenario/test/integration/packages.rb

@@ -1,36 +0,0 @@
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class Packages < Scenario::Template
-            def perform(release, *rspec_args)
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = QA::Release.new(release)
-                gitlab.name = 'gitlab-packages'
-                gitlab.network = 'test'
-                gitlab.omnibus_config = <<~OMNIBUS
-                  gitlab_rails['packages_enabled'] = true;
-                OMNIBUS
-
-                gitlab.instance do
-                  puts "Running packages specs!"
-
-                  rspec_args << "--" unless rspec_args.include?('--')
-                  rspec_args << %w[--tag packages]
-
-                  Component::Specs.perform do |specs|
-                    specs.suite = 'Test::Instance::All'
-                    specs.release = gitlab.release
-                    specs.network = gitlab.network
-                    specs.args = [gitlab.address, *rspec_args]
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end