gitlab-qa 8.10.2 → 8.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce6a96929be3b7acd00c732df6b26ed29a4cc408644476d21c1958bb975ee939
-  data.tar.gz: 6a20e2991f73d98592a07acd6784a7f859428ffabdba8978efd323b323dc16ff
+  metadata.gz: bee7c1ce41e9ceeeb14546a8983a5c3f90b3da4f6a3f32505bc77c08f0e484a9
+  data.tar.gz: dd74a1afa61040fc2110c0f3f63a381f8b1da4f07fb82b4629cdc979378ec67d
 SHA512:
-  metadata.gz: 28919be695aed93cf5e6386be79a5dd5b94635a2f691f4f8eff7fe3766ce1ee4ad1e630307bf1f77b2cff93f3b8237f999081735aede83924e23b9b451aa5c0a
-  data.tar.gz: 2d3f278b76595ed49d83507295042657cd4c2dc4d853ced19f466b6cb146dee6e23c30ec071af36e0a546109331c2a3938bb40cbe825059be482043550be2380
+  metadata.gz: d22ff4d7fa0452bac353fcd80a68f8c2bd1598f0515483c4f0a749c6ab3f225bd4d763cf17ce21f7c1a446530d254ace11a2a5c5d6a581e985572c58ce07da80
+  data.tar.gz: b0fe8a3cfbefcd39f971eab382171df61691d920303f8f89ab4b3a04bcb5b7ac4ff4586bb08196dbe7f1ba2f0e98ea8ce1deca4822407d22b80891e6dc306eaf

data/.gitlab/ci/jobs/integrations.gitlab-ci.yml

@@ -1,14 +1,14 @@
-ce:integrations:
+ee:integrations:
   extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-variables
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Integrations"
 
-ce:integrations-quarantine:
+ee:integrations-quarantine:
   extends:
-    - ce:integrations
+    - ee:integrations
     - .quarantine

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.10.2)
+    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/docs/what_tests_can_be_run.md

@@ -670,7 +670,7 @@ $ export EE_LICENSE=$(cat /path/to/GitLab.gitlab_license)
 $ gitlab-qa Test::Integration::Jira EE
 ```
 
-### `Test::Integration::Integrations CE|<full image address>`
+### `Test::Integration::Integrations CE|EE|<full image address>`
 
 This scenario is intended to test the different integrations that a GitLab instance can offer, such as WebHooks to an external service, Jenkins, etc.
 
@@ -681,7 +681,7 @@ container is spun up and tests are run from it by running the
 Example:
 
 ```
-$ gitlab-qa Test::Integration::Integrations CE
+$ gitlab-qa Test::Integration::Integrations EE
 ```
 
 ### `Test::Instance::Any CE|EE|<full image address>:nightly|latest|any_tag http://your.instance.gitlab`

data/lib/gitlab/qa/component/base.rb

@@ -43,6 +43,10 @@ module Gitlab
           raise NotImplementedError, "#{self.class.name} must specify a docker image tag as DOCKER_IMAGE_TAG"
         end
 
+        def start_instance
+          instance_no_teardown
+        end
+
         def instance(skip_teardown: false)
           instance_no_teardown do
             yield self if block_given?

data/lib/gitlab/qa/component/mock_server.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Component
+      class MockServer < Base
+        DOCKER_IMAGE = "thiht/smocker"
+        DOCKER_IMAGE_TAG = "0.18.2"
+
+        def initialize
+          super
+
+          @ports = %w[8080 8081]
+          @name = "smocker-server"
+        end
+
+        attr_reader :name
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "parallel"
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          # Scenario type for testing importers
+          #
+          # In addition to main gitlab instance, starts another gitlab instance to act as source
+          #   and mock server to replace all other possible import sources
+          #
+          class Import < Scenario::Template
+            def initialize
+              @source_gitlab = Component::Gitlab.new
+              @target_gitlab = Component::Gitlab.new
+              @mock_server = Component::MockServer.new
+              @network = "test"
+            end
+
+            attr_reader :source_gitlab, :target_gitlab, :mock_server, :network
+
+            def perform(release, *rspec_args)
+              start_mock_server
+              start_gitlab_instances(release)
+
+              run_specs(rspec_args)
+            ensure
+              mock_server.teardown
+              target_gitlab.teardown
+              source_gitlab.teardown
+            end
+
+            private
+
+            # Start mock server instance
+            #
+            # @return [void]
+            def start_mock_server
+              mock_server.tap do |server|
+                server.network = network
+
+                server.start_instance
+              end
+            end
+
+            # Start gitlab instance
+            #
+            # @param [Gitlab::QA::Release] release
+            # @return [void]
+            def start_gitlab_instances(release)
+              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
+
+                  gitlab.start_instance
+                end
+              end
+            end
+
+            # Run tests
+            #
+            # @param [Array] rspec_args
+            # @return [void]
+            def run_specs(rspec_args)
+              Component::Specs.perform do |specs|
+                specs.suite = "Test::Integration::Import"
+                specs.release = target_gitlab.release
+                specs.network = network
+                specs.env = { "QA_IMPORT_SOURCE_URL" => source_gitlab.address, "QA_ALLOW_LOCAL_REQUESTS" => "true" }
+                specs.args = [target_gitlab.address, *rspec_args]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.10.2'
+    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.10.2
+  version: 8.12.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-11 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
@@ -332,6 +333,7 @@ files:
 - lib/gitlab/qa/component/ldap.rb
 - lib/gitlab/qa/component/mail_hog.rb
 - lib/gitlab/qa/component/minio.rb
+- lib/gitlab/qa/component/mock_server.rb
 - lib/gitlab/qa/component/opensearch.rb
 - lib/gitlab/qa/component/postgresql.rb
 - lib/gitlab/qa/component/preprod.rb
@@ -405,6 +407,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb
 - lib/gitlab/qa/scenario/test/integration/gitlab_pages.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
+- lib/gitlab/qa/scenario/test/integration/import.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
 - lib/gitlab/qa/scenario/test/integration/integrations.rb
 - lib/gitlab/qa/scenario/test/integration/jira.rb