gitlab-qa 8.11.0 → 8.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e671dd38d183bc823c72bb1a4a7d597912b0d31e6169487d7733069bdcbadb8
-  data.tar.gz: e851a0dcaede0a6c33627bf4a0a794d9f083b05080fb79e7246c1e0c9bb31058
+  metadata.gz: bee7c1ce41e9ceeeb14546a8983a5c3f90b3da4f6a3f32505bc77c08f0e484a9
+  data.tar.gz: dd74a1afa61040fc2110c0f3f63a381f8b1da4f07fb82b4629cdc979378ec67d
 SHA512:
-  metadata.gz: 91d4ae5bb59dfad449f73bf8b4f84cb8d8f22447611f8a19fa81bd0d2c9800c6a4ff42adfa95f4dad491d011d2f85144088e5bf91a420d02ed1fa9dd5b7ed592
-  data.tar.gz: 4b658660ca1c90e1764270f4c0b7b8e36210120a8a80b5c298e0d381e55ddb163a93cb2123e81d9bb461584b930fb45640dac6cbdd807513c017727f2f23ac23
+  metadata.gz: d22ff4d7fa0452bac353fcd80a68f8c2bd1598f0515483c4f0a749c6ab3f225bd4d763cf17ce21f7c1a446530d254ace11a2a5c5d6a581e985572c58ce07da80
+  data.tar.gz: b0fe8a3cfbefcd39f971eab382171df61691d920303f8f89ab4b3a04bcb5b7ac4ff4586bb08196dbe7f1ba2f0e98ea8ce1deca4822407d22b80891e6dc306eaf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.11.0)
+    gitlab-qa (8.12.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

data/docs/omnibus_configurations/license_mode.md

@@ -0,0 +1,11 @@
+# License Mode Omnibus Configuration
+
+This configuration is used to set the License Mode in GitLab to test.
+
+When GitLab's License Mode is set to test, GitLab will not enforce License Key encryption to activate an instance
+with an Enterprise License
+
+## What happens?
+
+GitLab-QA will set the environment variable `GITLAB_LICENSE_MODE=test` and set the `CUSTOMER_PORTAL_URL=<URL>` where URL
+is `ENV['CUSTOMER_PORTAL_URL']` or CDot Staging (`https://customers.staging.gitlab.com`).

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

@@ -5,6 +5,14 @@ module Gitlab
     module Runtime
       module OmnibusConfigurations
         class DecompositionMultipleDb < Default
+          DATABASE_EXISTENCE_CHECK_COMMAND = <<~CMD.chomp
+            gitlab-psql -d gitlabhq_production_ci -c 'select 1' 2>1 > /dev/null
+          CMD
+
+          SCHEMA_EXISTENCE_CHECK_COMMAND = <<~CMD.chomp
+            gitlab-psql -d gitlabhq_production_ci -c "select schema_name from information_schema.schemata where schema_name = 'gitlab_partitions_dynamic'" | grep -q gitlab_partitions_dynamic
+          CMD
+
           def configuration
             # HACK: commenting commands out as these commands should be run *after* the first
             # reconfiguration (see first command in #exec_commands)
@@ -19,10 +27,12 @@ module Gitlab
             [
               "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",
+              # Create database only if it does not exist.
+              "#{DATABASE_EXISTENCE_CHECK_COMMAND} || gitlab-psql -c 'create database gitlabhq_production_ci owner gitlab'",
+              "gitlab-psql -d gitlabhq_production_ci -c 'create extension if not exists btree_gist'",
+              "gitlab-psql -d gitlabhq_production_ci -c 'create extension if not exists pg_trgm'",
+              # Load schema only if it does not exist.
+              "#{SCHEMA_EXISTENCE_CHECK_COMMAND} || gitlab-rake db:structure:load:ci",
               "gitlab-ctl restart"
             ].freeze
           end

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

@@ -7,9 +7,16 @@ module Gitlab
         class LicenseMode < Default
           def configuration
             <<~OMNIBUS
-              gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => 'https://customers.staging.gitlab.com' }
+              gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => '#{customer_portal_url}' }
             OMNIBUS
           end
+
+          private
+
+          # Customer Portal URL that is targeted
+          def customer_portal_url
+            ENV.fetch('CUSTOMER_PORTAL_URL', 'https://customers.staging.gitlab.com')
+          end
         end
       end
     end

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

@@ -51,8 +51,13 @@ module Gitlab
             # @param [Gitlab::QA::Release] release
             # @return [void]
             def start_gitlab_instances(release)
-              ::Parallel.each([source_gitlab, target_gitlab], in_threads: 2) do |gitlab_instance|
-                gitlab_instance.tap do |gitlab|
+              instances = [
+                { instance: source_gitlab, name: "import-source" },
+                { instance: target_gitlab, name: "import-target" }
+              ]
+              ::Parallel.each(instances, in_threads: 2) do |gitlab_instance|
+                gitlab_instance[:instance].tap do |gitlab|
+                  gitlab.name = gitlab_instance[:name]
                   gitlab.network = network
                   gitlab.release = release
                   gitlab.seed_admin_token = true
@@ -71,7 +76,7 @@ module Gitlab
                 specs.suite = "Test::Integration::Import"
                 specs.release = target_gitlab.release
                 specs.network = network
-                specs.env = { "QA_IMPORT_SOURCE_URL" => source_gitlab.address }
+                specs.env = { "QA_IMPORT_SOURCE_URL" => source_gitlab.address, "QA_ALLOW_LOCAL_REQUESTS" => "true" }
                 specs.args = [target_gitlab.address, *rspec_args]
               end
             end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.11.0'
+    VERSION = '8.12.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.11.0
+  version: 8.12.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -310,6 +310,7 @@ files:
 - docs/architecture.md
 - docs/configuring_omnibus.md
 - docs/how_it_works.md
+- docs/omnibus_configurations/license_mode.md
 - docs/release_process.md
 - docs/run_qa_against_gdk.md
 - docs/running_against_remote_grid.md