gitlab-qa 7.22.1 → 7.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b84d309cb564568e54d7247df7a6af8d8bc2290953e3b33c72531a153415cf4
-  data.tar.gz: 9270ff23791f40e767cf05a59c08c07e6c6ee53b9f0a3b26a4c9017f3e6809ee
+  metadata.gz: 667197342275f6df37533b1873c6d0cfc7ae66d43bc600af2baa1eca89dc3891
+  data.tar.gz: 0fa801cb8ba230a40864cc6106edcbaaf1a5190b5e24bf1f2e89a36c2bcf99a3
 SHA512:
-  metadata.gz: fc7d787a61d9608ab97e402c42a440acc9751022c5e323a572be6299742411d43470dfe9155207cc46dd18561fab53a1b81340f7c388efeb8fa1695dca623871
-  data.tar.gz: '04599e2bfac686c3452093d8e356fabaaff705a31c11e8c934bafc8ece1df91cce1defe5b20f5cc1fba83ec3de2d4a52e4885634440946a4c60863dc067a37da'
+  metadata.gz: 0a02f18c341ce5fa7f3435b890db6c2d6b9afba8c501fe818b15f75640840b6cb1bc4af29802007fce8af76390aed2cfa53328ab9861307cda87773add8b730f
+  data.tar.gz: 85fec2a1eb1184e5b519c7af38853759a78bc54366b8b164d8de133833e9a1cf9c35b4670c24c7bca5a4872704f64f940e652fc246998dd933d2984f5208d47c

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/gitlab-qa.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'climate_control', '~> 0.2'
+  spec.add_development_dependency 'climate_control', '~> 1.0.1'
   spec.add_development_dependency 'gitlab-styles', '~> 6.2.1'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/gitlab/qa/component/minio.rb

@@ -9,7 +9,7 @@ module Gitlab
     module Component
       class Minio < Base
         DOCKER_IMAGE = 'minio/minio'.freeze
-        DOCKER_IMAGE_TAG = 'RELEASE.2021-09-15T04-54-25Z'.freeze
+        DOCKER_IMAGE_TAG = 'latest'.freeze
         # These are secrets used in a local Minio container, they're not used for any online S3 server.
         AWS_ACCESS_KEY = 'AKIAIOSFODNN7EXAMPLE'.freeze
         AWS_SECRET_KEY = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'.freeze

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

@@ -55,6 +55,8 @@ module Gitlab
           #{generate_stages_listing(tests)}
 
           #{generate_qa_issue_relation}
+
+          #{generate_link_to_dashboard}
           MARKDOWN
         end
 
@@ -257,6 +259,16 @@ module Gitlab
           /relate #{Runtime::Env.qa_issue_url}
           MARKDOWN
         end
+
+        def generate_link_to_dashboard
+          return unless Runtime::Env.qa_run_type
+
+          <<~MARKDOWN.chomp
+          ## Link to Grafana dashboard for run-type of #{Runtime::Env.qa_run_type}
+
+          * https://dashboards.quality.gitlab.net/d/kuNYMgDnz/test-run-metrics?orgId=1&refresh=1m&var-run_type=#{Runtime::Env.qa_run_type}
+          MARKDOWN
+        end
       end
     end
   end

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)
 
@@ -35,41 +35,44 @@ 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}'."
+            post_failed_job_note(issue, test)
           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 +149,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 +163,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.22.1'
+    VERSION = '7.24.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.22.1
+  version: 7.24.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: gitlab-styles
   requirement: !ruby/object:Gem::Requirement