gitlab-qa 8.10.2 → 8.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce6a96929be3b7acd00c732df6b26ed29a4cc408644476d21c1958bb975ee939
-  data.tar.gz: 6a20e2991f73d98592a07acd6784a7f859428ffabdba8978efd323b323dc16ff
+  metadata.gz: 8e671dd38d183bc823c72bb1a4a7d597912b0d31e6169487d7733069bdcbadb8
+  data.tar.gz: e851a0dcaede0a6c33627bf4a0a794d9f083b05080fb79e7246c1e0c9bb31058
 SHA512:
-  metadata.gz: 28919be695aed93cf5e6386be79a5dd5b94635a2f691f4f8eff7fe3766ce1ee4ad1e630307bf1f77b2cff93f3b8237f999081735aede83924e23b9b451aa5c0a
-  data.tar.gz: 2d3f278b76595ed49d83507295042657cd4c2dc4d853ced19f466b6cb146dee6e23c30ec071af36e0a546109331c2a3938bb40cbe825059be482043550be2380
+  metadata.gz: 91d4ae5bb59dfad449f73bf8b4f84cb8d8f22447611f8a19fa81bd0d2c9800c6a4ff42adfa95f4dad491d011d2f85144088e5bf91a420d02ed1fa9dd5b7ed592
+  data.tar.gz: 4b658660ca1c90e1764270f4c0b7b8e36210120a8a80b5c298e0d381e55ddb163a93cb2123e81d9bb461584b930fb45640dac6cbdd807513c017727f2f23ac23

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.11.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

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/scenario/test/integration/import.rb

@@ -0,0 +1,83 @@
+# 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)
+              ::Parallel.each([source_gitlab, target_gitlab], in_threads: 2) do |gitlab_instance|
+                gitlab_instance.tap do |gitlab|
+                  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 }
+                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.11.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.11.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -332,6 +332,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 +406,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