gitlab-qa 7.23.0 → 7.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7604899a14fd7faaae2ee398b5b0769df8dde4badfd2123fa27993b1a0cbda
-  data.tar.gz: c3fea270e1583201349b1c73c10aab49a5db9c969714ab842ab21436155c8d96
+  metadata.gz: 16d436d7dcc1ff54323d22b1ced1c4685c78b2ac4290e4deea6f4720b26c7bda
+  data.tar.gz: 8250c321d7130510768ea563bda98978f9ca53c6eac55344ad7475aa4c771324
 SHA512:
-  metadata.gz: 404e72b88f829f186a99bf2302fa92161b5267494b6ac3e91209c19882da58f348814394a5c23f02edfa3462715bcc4b4b5e136d2bd13c1e5bfa6c475f164c6c
-  data.tar.gz: f043de46cddd1b120fbd972224e4eef339b3b22acfd25e28e972e9407c93d38c65234d4c67049d517366b5bbf2b54177da5cc336615cdb1ee4af572c9ba9467c
+  metadata.gz: bc86efe53b8067cdf2bcf0788dc9c740bbdf32a8cb0be16d5c3dfee4e5b774f2c4f0ec4787169805d5ca04a075fd0ea3b35bca5b20ae5657906efc8be50eff80
+  data.tar.gz: 306ee5e2b20f62f50249a5741471a41904e071656b81168e11236398d3b9d3a933419055b84f7667dc23e642163a83ee66aee29c6f3cc0745251cbdcc5b3e696

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 ~"feature::maintenance"
+/label ~Quality ~"type::maintenance"

data/.gitlab-ci.yml

@@ -328,7 +328,7 @@ ce:repository_storage-quarantine:
 
 ee:repository_storage:
   extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
     - .ee-variables
@@ -360,7 +360,7 @@ ee:image:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=EE}
   extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .ee-variables
 

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

@@ -12,7 +12,7 @@ module Gitlab
         DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION = 0.15
         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::investigating priority::2]).freeze
+        NEW_ISSUE_LABELS = Set.new(%w[QA Quality test failure::new priority::2]).freeze
 
         MultipleIssuesFound = Class.new(StandardError)
 
@@ -20,6 +20,7 @@ module Gitlab
           super
           @max_diff_ratio = max_diff_ratio.to_f
           @issue_type = 'issue'
+          @commented_issue_list = Set.new
         end
 
         private
@@ -35,41 +36,45 @@ module Gitlab
             test_results.each do |test|
               next if test.failures.empty?
 
-              relate_test_to_issue(test)
+              relate_failure_to_issue(test)
             end
 
             test_results.write
           end
         end
 
-        def relate_test_to_issue(test)
+        def relate_failure_to_issue(test)
           puts "  => Searching issues for test '#{test.name}'..."
 
           begin
-            issue = find_or_create_issue(test)
+            issue = find_and_link_issue(test) || create_issue(test)
             return unless issue
 
             update_labels(issue, test)
-            post_failed_job_note(issue, test)
-            puts "  => Marked #{issue.web_url} as related to #{test.testcase}."
           rescue MultipleIssuesFound => e
             warn(e.message)
           end
         end
 
-        def find_or_create_issue(test)
+        def find_and_link_issue(test)
           issue, diff_ratio = find_failure_issue(test)
 
           if issue
             puts "  => Found issue #{issue.web_url} for test '#{test.name}' with a diff ratio of #{(diff_ratio * 100).round(2)}%."
-          else
-            issue = create_issue(test)
-            puts "for test '#{test.name}'."
+            @commented_issue_list.include?(issue.web_url) ? (puts " => Failure already commented on issue.") : post_failed_job_note(issue, test)
+            @commented_issue_list.add(issue.web_url)
           end
 
           issue
         end
 
+        def create_issue(test)
+          issue = super
+          puts "for test '#{test.name}'."
+
+          issue
+        end
+
         def failure_issues(test)
           gitlab.find_issues(options: { state: 'opened', labels: 'QA' }).select do |issue|
             issue_title = issue.title.strip
@@ -146,7 +151,8 @@ module Gitlab
           super + [
             "\n\n### Stack trace",
             "```\n#{test.failures.first['message_lines'].join("\n")}\n```",
-            "First happened in #{test.ci_job_url}."
+            "First happened in #{test.ci_job_url}.",
+            "Related test case: #{test.testcase}."
           ].join("\n\n")
         end
 
@@ -159,7 +165,8 @@ module Gitlab
         end
 
         def post_failed_job_note(issue, test)
-          gitlab.create_issue_note(iid: issue.iid, note: "/relate #{test.testcase}")
+          gitlab.create_issue_note(iid: issue.iid, note: "Failure occurred in #{pipeline} pipeline: #{test.ci_job_url}")
+          puts "  => Linked #{test.ci_job_url} to #{issue.web_url}."
         end
 
         def new_issue_title(test)

data/lib/gitlab/qa/runtime/env.rb

@@ -143,12 +143,18 @@ module Gitlab
         end
 
         def variables
-          ENV_VARIABLES.each_with_object({}) do |(name, attribute), vars|
+          defined_variables = ENV_VARIABLES.each_with_object({}) do |(name, attribute), vars|
             # Variables that are overridden in the environment take precedence
             # over the defaults specified by the QA runtime.
             value = env_var_name_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
             vars[name] = value if value
           end
+          qa_variables = ENV.select { |k, _v| k.start_with?('QA_') }
+
+          {
+            **qa_variables,
+            **defined_variables
+          }
         end
 
         def debug?

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.23.0'
+    VERSION = '7.24.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.23.0
+  version: 7.24.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control