gitlab-qa 8.10.0 → 8.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f953400de439363c7574e32bc75e4dfe90a51223708bb57c38c268e591b57bc8
-  data.tar.gz: fa43874f0bfd3e8524ab496bf44ea21b67dd42a8cecc532a6d020050603c3a2a
+  metadata.gz: ce6a96929be3b7acd00c732df6b26ed29a4cc408644476d21c1958bb975ee939
+  data.tar.gz: 6a20e2991f73d98592a07acd6784a7f859428ffabdba8978efd323b323dc16ff
 SHA512:
-  metadata.gz: fc7a630d56deab744601fe176c17c52fdec1073701b990118eb7a11068e44faa65f068de470b1c340b8bca9fd4fc2d61fa82f980be84f8fd4c6c405799bfefe7
-  data.tar.gz: c5638a094566d7b27cf24a0d6ec4a7eebfcee7c8e26df7c5ea32d86a3944b3d6b59ec9f4ce768c20206bb743b8a6bd477521e6d4832f97fa005cd193fb23b43b
+  metadata.gz: 28919be695aed93cf5e6386be79a5dd5b94635a2f691f4f8eff7fe3766ce1ee4ad1e630307bf1f77b2cff93f3b8237f999081735aede83924e23b9b451aa5c0a
+  data.tar.gz: 2d3f278b76595ed49d83507295042657cd4c2dc4d853ced19f466b6cb146dee6e23c30ec071af36e0a546109331c2a3938bb40cbe825059be482043550be2380

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

@@ -4,7 +4,7 @@ stages:
   - notify
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.7
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3-docker-${DOCKER_VERSION}
   tags:
     - gitlab-org
   cache:
@@ -12,6 +12,7 @@ default:
       files:
         - Gemfile.lock
         - gitlab-qa.gemspec
+      prefix: $RUBY_VERSION
     paths:
       - vendor/ruby
   before_script:
@@ -79,6 +80,8 @@ variables:
   QA_TESTCASE_SESSIONS_PROJECT: "gitlab-org/quality/testcase-sessions"
   # QA_DEFAULT_BRANCH is the default branch name of the instance under test.
   QA_DEFAULT_BRANCH: "master"
+  RUBY_VERSION: "2.7"
+  DOCKER_VERSION: "20.10.14"
 
 .ce-variables:
   variables:

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,4 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-qa/commits/mast
 - Checklist after merging:
   - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
 
-/label ~Quality ~"type::maintenance"
+/label ~Quality ~"type::maintenance" ~"maintenance::dependency"

data/.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
   - deploy
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.7
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
   tags:
     - gitlab-org
   cache:
@@ -13,6 +13,7 @@ default:
       files:
         - Gemfile.lock
         - gitlab-qa.gemspec
+      prefix: $RUBY_VERSION
     paths:
       - vendor/ruby
   before_script:
@@ -40,16 +41,24 @@ workflow:
     # When using Run pipeline button in the GitLab UI, from the project’s CI/CD > Pipelines section, create a pipeline.
     - if: '$CI_PIPELINE_SOURCE == "web"'
 
+variables:
+  RUBY_VERSION: "2.7"
+
 .check-base:
   stage: check
-  script:
-    - bundle exec $CI_JOB_NAME --color
+  parallel:
+    matrix:
+      - RUBY_VERSION: ["2.7", "3.0"]
 
 rubocop:
   extends: .check-base
+  script:
+    - bundle exec rubocop --color
 
 rspec:
   extends: .check-base
+  script:
+    - bundle exec rspec --force-color
 
 prepare:
   stage: generate

data/.rubocop.yml

@@ -39,3 +39,7 @@ Layout/SpaceBeforeFirstArg:
 
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
+
+CodeReuse/ActiveRecord:
+  Exclude:
+    - 'spec/**/*_spec.rb'

data/Gemfile.lock

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

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/support/shell_command.rb

@@ -32,7 +32,7 @@ module Gitlab
 
           logger.info("Shell command: `#{mask_secrets(command).cyan}`")
 
-          Open3.popen2e(@command.to_s) do |stdin, out, wait|
+          Open3.popen2e(command.to_s) do |stdin, out, wait|
             if @stdin_data
               stdin.puts(@stdin_data)
               stdin.close
@@ -90,7 +90,7 @@ module Gitlab
         # @param [String] input the string to mask
         # @return [String] The masked string
         def mask_secrets(input)
-          @mask_secrets.each_with_object(+input) { |secret, s| s.gsub!(secret, '*****') }.to_s
+          @mask_secrets.reduce(input) { |s, secret| s.gsub(secret, '*****') }.to_s
         end
       end
     end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.10.0'
+    VERSION = '8.10.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.10.0
+  version: 8.10.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control