gitlab-qa 7.25.0 → 7.27.0

data/lib/gitlab/qa/runtime/omnibus_configurations/ci_decomposition.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Runtime
+      module OmnibusConfigurations
+        class CiDecomposition < Default
+          def configuration
+            # HACK: commenting commands out as these commands should be run *after* the first
+            # reconfiguration (see first command in #exec_commands)
+            <<~OMNIBUS
+              #gitlab_rails['databases']['main']['enable'] = true
+              #gitlab_rails['databases']['ci']['enable'] = true
+              #gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production_ci'
+            OMNIBUS
+          end
+
+          def exec_commands
+            [
+              "sed -i 's/#gitlab_rails/gitlab_rails/g' /etc/gitlab/gitlab.rb",
+              "gitlab-ctl reconfigure",
+              "gitlab-psql -c 'create database gitlabhq_production_ci owner gitlab'",
+              "gitlab-psql -d gitlabhq_production_ci -c 'create extension btree_gist'",
+              "gitlab-psql -d gitlabhq_production_ci -c 'create extension pg_trgm'",
+              "gitlab-rake db:structure:load:ci"
+            ].freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb

@@ -27,6 +27,7 @@ module Gitlab
                 specs.suite = @suite
                 specs.release = release
                 specs.args = non_rspec_args.push(*args)
+                specs.volumes[host_knapsack_report_path] = "/home/gitlab/qa/knapsack" if host_knapsack_report_path
               end
             end
 
@@ -37,6 +38,10 @@ module Gitlab
             def deployment_component
               raise NotImplementedError, 'Please define the Component for the deployment environment associated with this scenario.'
             end
+
+            def host_knapsack_report_path
+              ENV["QA_KNAPSACK_REPORT_PATH"]
+            end
           end
         end
       end

data/lib/gitlab/qa/scenario/test/instance/image.rb

@@ -4,10 +4,11 @@ module Gitlab
       module Test
         module Instance
           class Image < Scenario::Template
-            attr_writer :volumes
+            attr_writer :volumes, :seed_admin_token
 
             def initialize
               @volumes = {}
+              @seed_admin_token = true
             end
 
             def perform(release, *rspec_args)
@@ -15,6 +16,7 @@ module Gitlab
                 gitlab.release = release
                 gitlab.volumes = @volumes
                 gitlab.network = 'test'
+                gitlab.seed_admin_token = @seed_admin_token
 
                 gitlab.instance do
                   Component::Specs.perform do |specs|

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

@@ -16,6 +16,7 @@ module Gitlab
                 primary.release = release
                 primary.name = 'gitlab-primary'
                 primary.network = 'geo'
+                primary.seed_admin_token = false
                 primary.omnibus_configuration << <<~OMNIBUS
                   gitlab_rails['db_key_base'] = '4dd58204865eb41bca93bd38131d51cc';
                   geo_primary_role['enable'] = true;
@@ -54,7 +55,7 @@ module Gitlab
                       sidekiq['concurrency'] = 2;
                       puma['worker_processes'] = 2;
                     OMNIBUS
-                    secondary.exec_commands = fast_ssh_key_lookup_commands + QA::Scenario::CLICommands.git_lfs_install_commands
+                    secondary.exec_commands += fast_ssh_key_lookup_commands + QA::Scenario::CLICommands.git_lfs_install_commands
 
                     secondary.act do
                       # TODO, we do not wait for secondary to start because of

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

@@ -37,6 +37,7 @@ module Gitlab
                 praefect.name = @praefect_node_name
                 praefect.network = @network
                 praefect.skip_availability_check = true
+                praefect.seed_admin_token = false
 
                 praefect.omnibus_configuration << praefect_omnibus_configuration
 
@@ -196,6 +197,7 @@ module Gitlab
                 gitaly.name = name
                 gitaly.network = @network
                 gitaly.skip_availability_check = true
+                gitaly.seed_admin_token = false
                 gitaly.omnibus_configuration << gitaly_omnibus_configuration
                 gitaly.instance(skip_teardown: true)
               end

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

@@ -22,7 +22,11 @@ module Gitlab
                     specs.suite = 'Test::Integration::Mattermost'
                     specs.release = gitlab.release
                     specs.network = gitlab.network
-                    specs.args = [gitlab.address, mattermost_external_url, *rspec_args]
+                    specs.args = [
+                      gitlab.address,
+                      "--mattermost-address", mattermost_external_url,
+                      *rspec_args
+                    ]
                   end
                 end
               end

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

@@ -19,6 +19,7 @@ module Gitlab
                 gitaly.name = @gitaly_name
                 gitaly.network = @network
                 gitaly.skip_availability_check = true
+                gitaly.seed_admin_token = false
 
                 gitaly.omnibus_configuration << gitaly_omnibus
                 gitaly.gitaly_tls

data/lib/gitlab/qa/scenario/test/omnibus/update.rb

@@ -16,6 +16,7 @@ module Gitlab
                   gitlab.release = previous_release
                   gitlab.volumes = volumes
                   gitlab.network = 'test'
+                  gitlab.seed_admin_token = false
                   gitlab.launch_and_teardown_instance
                 end
 

data/lib/gitlab/qa/scenario/test/omnibus/upgrade.rb

@@ -23,6 +23,7 @@ module Gitlab
                 Scenario::Test::Instance::Image
                   .perform(ce_release.to_ee, *rspec_args) do |scenario|
                   scenario.volumes = volumes
+                  scenario.seed_admin_token = false
                 end
               end
             end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.25.0'
+    VERSION = '7.27.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -20,6 +20,7 @@ module Gitlab
         autoload :ObjectStorageGcs, 'gitlab/qa/runtime/omnibus_configurations/object_storage_gcs'
         autoload :LicenseMode, 'gitlab/qa/runtime/omnibus_configurations/license_mode'
         autoload :RegistryObjectStorage, 'gitlab/qa/runtime/omnibus_configurations/registry_object_storage'
+        autoload :CiDecomposition, 'gitlab/qa/runtime/omnibus_configurations/ci_decomposition'
       end
     end