gitlab-qa 8.10.1 → 8.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e48c81786f8f96655e3c8096e804cf08b1ca602133fb10b3238d581df26957
-  data.tar.gz: faf446327a9eba30bb029771ca8658097da2b3852a4389fe1d3309cf370c037f
+  metadata.gz: 8e671dd38d183bc823c72bb1a4a7d597912b0d31e6169487d7733069bdcbadb8
+  data.tar.gz: e851a0dcaede0a6c33627bf4a0a794d9f083b05080fb79e7246c1e0c9bb31058
 SHA512:
-  metadata.gz: ee989bb53b1fae1ff3ab34780f20b8cb609cb23aee4d74ec04d2b7f31aeae78d136157044009e79fa53084f9edb168c69150596fedab77670385b5e56803138c
-  data.tar.gz: 1d3355039191667d8415097781afc5f49294e4c0fe9c10407c92537085ee088e642cf167518e2a4688faeb4410f20c7e2cc9e70d7d6bd0c05539fbd0667f43c1
+  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.1)
+    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/report/relate_failure_issue.rb

@@ -16,6 +16,7 @@ module Gitlab
         FAILURE_STACKTRACE_REGEX = %r{((.*Failure\/Error:(?<stacktrace>.+))|(?<stacktrace>.+))}m.freeze
         ISSUE_STACKTRACE_REGEX = /### Stack trace\s*(```)#{FAILURE_STACKTRACE_REGEX}(```)/m.freeze
         NEW_ISSUE_LABELS = Set.new(%w[QA Quality test failure::new priority::2]).freeze
+        IGNORE_EXCEPTIONS = ['Net::ReadTimeout'].freeze
 
         MultipleIssuesFound = Class.new(StandardError)
 
@@ -37,9 +38,7 @@ module Gitlab
             puts "=> Reporting tests in #{test_results.path}"
 
             test_results.each do |test|
-              next if test.failures.empty?
-
-              relate_failure_to_issue(test)
+              relate_failure_to_issue(test) if should_report?(test)
             end
 
             test_results.write
@@ -90,7 +89,7 @@ module Gitlab
         end
 
         def full_stacktrace(test)
-          if test.failures.first['message_lines'].empty?
+          if test.failures.first['message_lines'].empty? || test.failures.first['message_lines'].instance_of?(String)
             test.failures.first['message']
           else
             test.failures.first['message_lines'].join("\n")
@@ -234,6 +233,40 @@ module Gitlab
             puts "  => No product group metadata found for test '#{test.name}'"
           end
         end
+
+        # Checks if a test failure should be reported.
+        #
+        # @return [Boolean] false if the test was skipped or failed because of a transient error that can be ignored.
+        # Otherwise returns true.
+        def should_report?(test)
+          return false if test.failures.empty?
+
+          if test.report.key?('exceptions')
+            reason = ignore_failure_reason(test.report['exceptions'])
+
+            if reason
+              puts "Failure reporting skipped because #{reason}"
+
+              return false
+            end
+          end
+
+          true
+        end
+
+        # Determine any reason to ignore a failure.
+        #
+        # @param [Array<Hash>] exceptions the exceptions associated with the failure.
+        # @return [String] the reason to ignore the exceptions, or `nil` if any exceptions should not be ignored.
+        def ignore_failure_reason(exceptions)
+          exception_classes = exceptions
+            .filter_map { |exception| exception['class'] if IGNORE_EXCEPTIONS.include?(exception['class']) }
+            .compact
+          return if exception_classes.empty? || exception_classes.size < exceptions.size
+
+          msg = exception_classes.many? ? 'the errors were' : 'the error was'
+          "#{msg} #{exception_classes.join(', ')}"
+        end
       end
     end
   end

data/lib/gitlab/qa/report/report_results.rb

@@ -7,8 +7,6 @@ module Gitlab
       class ReportResults < ReportAsIssue
         attr_accessor :testcase_project_reporter, :results_issue_project_reporter, :files, :test_case_project, :results_issue_project, :gitlab
 
-        IGNORE_EXCEPTIONS = ['Net::ReadTimeout'].freeze
-
         def initialize(token:, input_files:, test_case_project: nil, results_issue_project: nil, dry_run: false, **kwargs)
           @testcase_project_reporter = Gitlab::QA::Report::ResultsInTestCases.new(token: token, input_files: input_files, project: test_case_project, dry_run: dry_run, **kwargs)
           @results_issue_project_reporter = Gitlab::QA::Report::ResultsInIssues.new(token: token, input_files: input_files, project: results_issue_project, dry_run: dry_run, **kwargs)
@@ -24,6 +22,7 @@ module Gitlab
           abort "Please provide valid project IDs or paths with the `--results-issue-project` and `--test-case-project` options!"
         end
 
+        # rubocop:disable Metrics/AbcSize
         def run!
           puts "Reporting test results in `#{files.join(',')}` as test cases in project `#{test_case_project}`"\
                " and issues in project `#{results_issue_project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
@@ -32,14 +31,17 @@ module Gitlab
             puts "Reporting tests in #{test_results.path}"
 
             test_results.each do |test|
+              next if test.file.include?('/features/sanity/') || test.skipped
+
               puts "Reporting test: #{test.file} | #{test.name}\n"
 
-              report_test(test) if should_report?(test)
+              report_test(test)
             end
 
             test_results.write
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         private
 
@@ -56,40 +58,6 @@ module Gitlab
           testcase_project_reporter.update_testcase(testcase, test)
           results_issue_project_reporter.update_issue(issue, test)
         end
-
-        # Checks if a test result should be reported.
-        #
-        # @return [Boolean] false if the test was skipped or failed because of a transient error that can be ignored.
-        # Otherwise returns true.
-        def should_report?(test)
-          return false if test.skipped
-
-          if test.report.key?('exceptions')
-            reason = ignore_failure_reason(test.report['exceptions'])
-
-            if reason
-              puts "Issue update skipped because #{reason}"
-
-              return false
-            end
-          end
-
-          true
-        end
-
-        # Determine any reason to ignore a failure.
-        #
-        # @param [Array<Hash>] exceptions the exceptions associated with the failure.
-        # @return [String] the reason to ignore the exceptions, or `nil` if any exceptions should not be ignored.
-        def ignore_failure_reason(exceptions)
-          exception_classes = exceptions
-            .filter_map { |exception| exception['class'] if IGNORE_EXCEPTIONS.include?(exception['class']) }
-            .compact
-          return if exception_classes.empty? || exception_classes.size < exceptions.size
-
-          msg = exception_classes.many? ? 'the errors were' : 'the error was'
-          "#{msg} #{exception_classes.join(', ')}"
-        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.1'
+    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.1
+  version: 8.11.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-31 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