gitlab-qa 10.2.0 → 10.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aede5d84c866e5e020124c2e7d5df9e3a19a142ce774482eb6c05520c4442332
-  data.tar.gz: cc24b8d169a913fe0f8ff0ab69429201ded46e2ba10e6c1bd861a791b92e7683
+  metadata.gz: 1d4d6777aac07a8fbb1da706af278b89fa4abc6684b37a828ec8f3b8f0cd6c49
+  data.tar.gz: 2852a0396eb280993b58fcfe91f29b89565ba28c27615d12d9c04883aa2cfdac
 SHA512:
-  metadata.gz: 2e12535c73f7452f7ee0b4298d3ea04f3ddc24e759bd98c2ac43241fc85585d85ebcbe7cb14bfdb72a898417ddd5485b698d9fdc3345687a4a6964b18139f567
-  data.tar.gz: 00f4bd3f028d2b96f9cb251dd0816c29c8cf5365bc5243765c833b8d03c8ba47f57ecdda5eaa7204772a9965f6a864296b069b607a5317ea558026a216b240ba
+  metadata.gz: 8592539a7d61dbfd902853a53ad48310fdf216fb455be221d3d55fc27f1327919550844dade5496d003c83b54d9dfec9c4eafc7e78451b84e3d5b700c188f30c
+  data.tar.gz: cd50e445144fb5d2f70f91eb2ef3b0355f2b78c3712722746571703d7d1bcfa34f41e5462e5ddfa92bb13ae9b206662399dad78f3be8cfa7efc9cb7d42a44545

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,9 @@ 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).
 
+- Checklist after gitlab-qa version has been released by the post merge pipeline:
+  - [ ] In the pipeline-common project, [update the GITLAB_QA_VERSION](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/base.gitlab-ci.yml) and [create a release](https://gitlab.com/gitlab-org/quality/pipeline-common#release-process).
+  - [ ] In the GitLab project, update the ref for pipeline-common for [package-and-test](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/package-and-test/main.gitlab-ci.yml) and [review-apps](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/review-apps/qa.gitlab-ci.yml).
+  - [ ] Unless already done by [renovate-gitlab-bot](https://gitlab.com/dashboard/merge_requests?scope=all&state=opened&author_username=gitlab-dependency-update-bot&label_name[]=Quality), or if you need it sooner, in the GitLab project, [update the gitlab-qa gem version](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/Gemfile) and [`Gemfile.lock`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/Gemfile.lock) (for an example, see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117054).
+
 /label ~Quality ~"type::maintenance" ~"maintenance::dependency"

data/Gemfile.lock

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

data/docs/what_tests_can_be_run.md

@@ -315,7 +315,7 @@ $ gitlab-qa Test::Omnibus::Upgrade CE
 $ gitlab-qa Test::Omnibus::Upgrade gitlab/gitlab-ce:my-custom-tag
 ```
 
-### `Test::Omnibus::UpdateFromPrevious <full image address> <current_version> <major|minor>`
+### `Test::Omnibus::UpdateFromPrevious <full image address> <current_version> <major|minor> <from_edition>`
 
 Scenario verifies upgrade from previous (major|minor) version to current release.
 

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

@@ -19,7 +19,7 @@ module Gitlab
         FAILED_JOB_DESCRIPTION_REGEX = %r{First happened in https?:\/\/\S+\.}m.freeze
         FAILED_JOB_NOTE_REGEX = %r{Failed most recently in \D+ pipeline: https?:\/\/\S+}.freeze
         NEW_ISSUE_LABELS = Set.new(%w[QA Quality test failure::new priority::2]).freeze
-        IGNORE_EXCEPTIONS = ['Net::ReadTimeout'].freeze
+        IGNORE_EXCEPTIONS = ['Net::ReadTimeout', '403 Forbidden - Your account has been blocked'].freeze
 
         MultipleIssuesFound = Class.new(StandardError)
 
@@ -53,10 +53,10 @@ module Gitlab
           puts "  => Searching issues for test '#{test.name}'..."
 
           begin
-            issue = test.quarantine? ? find_and_link_issue(test) : find_and_link_issue(test) || create_issue(test)
-            return unless issue
+            issue, issue_already_commented = find_and_link_issue(test)
+            return create_issue(test) unless issue || test.quarantine?
 
-            update_labels(issue, test)
+            update_labels(issue, test) unless issue_already_commented
           rescue MultipleIssuesFound => e
             warn(e.message)
           end
@@ -64,19 +64,18 @@ module Gitlab
 
         def find_and_link_issue(test)
           issue, diff_ratio = find_failure_issue(test)
-          issue_already_commented = issue ? @commented_issue_list.include?(issue.web_url) : nil
+          return [false, true] unless issue
 
-          if issue && !issue_already_commented
+          issue_already_commented = issue_already_commented?(issue)
+          if issue_already_commented
+            puts " => Failure already commented on issue."
+          else
             puts "  => Found issue #{issue.web_url} for test '#{test.name}' with a diff ratio of #{(diff_ratio * 100).round(2)}%."
             post_or_update_failed_job_note(issue, test)
             @commented_issue_list.add(issue.web_url)
-          else
-            puts " => Failure already commented on issue." if issue_already_commented
-
-            return false
           end
 
-          issue
+          [issue, issue_already_commented]
         end
 
         def create_issue(test)
@@ -286,6 +285,8 @@ module Gitlab
           current_note = "Failed most recently in #{pipeline} pipeline: #{test.ci_job_url}"
           existing_note = existing_failure_note(issue)
 
+          return if existing_note && current_note == existing_note.body
+
           if existing_note
             gitlab.edit_issue_note(issue_iid: issue.iid, note_id: existing_note.id, note: current_note)
           else
@@ -355,13 +356,17 @@ module Gitlab
         # @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']) }
+          exception_messages = exceptions
+            .filter_map { |exception| exception['message'] if IGNORE_EXCEPTIONS.any? { |e| exception['message'].include?(e) } }
             .compact
-          return if exception_classes.empty? || exception_classes.size < exceptions.size
+          return if exception_messages.empty? || exception_messages.size < exceptions.size
+
+          msg = exception_messages.many? ? 'the errors were' : 'the error was'
+          "#{msg} #{exception_messages.join(', ')}"
+        end
 
-          msg = exception_classes.many? ? 'the errors were' : 'the error was'
-          "#{msg} #{exception_classes.join(', ')}"
+        def issue_already_commented?(issue)
+          @commented_issue_list.include?(issue.web_url)
         end
       end
     end

data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb

@@ -22,11 +22,18 @@ module Gitlab
             # @param [Array] *rspec_args rspec arguments
             # @return [void]
             def perform(release, current_version, semver_component, from_edition = nil, *rspec_args)
+              # When from_edition isn't actually passed but RSpec args arg passed with `-- rspec_args...`,
+              # from_edition is wrongly set to `--`, so we fix that here.
+              if from_edition == "--"
+                rspec_args.prepend('--')
+                from_edition = nil
+              end
+
               @current_release = QA::Release.new(release)
               @upgrade_path = Support::GitlabUpgradePath.new(
                 current_version,
                 semver_component,
-                from_edition.nil? || from_edition == "--" ? @current_release.edition : from_edition
+                from_edition || @current_release.edition
               ).fetch
 
               upgrade_info = "#{[*upgrade_path, current_release].join(' => ')} (#{current_version})".bright

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '10.2.0'
+    VERSION = '10.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 10.2.0
+  version: 10.2.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control