gitlab-qa 7.22.0 → 7.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844c99c0251d384017a5276158c67476caba4da667ac93fd5c753641173a3c22
-  data.tar.gz: b67e5382bb0493a147dcaef6b6afa6e63591673b302c04dafb00a07da6e428c3
+  metadata.gz: '099111f747da2553c13f0ad32cf6865a45324907cd8244bfb42ca15eec16108c'
+  data.tar.gz: 05b451d3a5217ae20a9a75aceac1d0b827771722011314055863944cbf6df829
 SHA512:
-  metadata.gz: 7a0342f9b71831a3f5d0924506e6f00d0f0621e0bc44096b285d2346afb23284bb56ade7778fc1613df5a3c3bc3f13e10ef58634f38e57eb95fbd45f99d1f776
-  data.tar.gz: 91a8a798f1b3f642954022124e8cb3ca07ec52b2579503979c973e880a5cea202447a15dc5b869aa6ac291745f6ed6f5075e527d10af6d84adc615321f7de5fb
+  metadata.gz: af14883ec9bbf29d306e3de0558f380de4703a1cc0d8a62f98f70297264d89344c30cb4143a2d8dfbed74c84fd346ed14594d8aa222a9aec6aa9e3edeb8e32ed
+  data.tar.gz: 35f8761799ba3ed8904d97f28b4a7da6255ceb57970c621b0f26e26e9e21ea7914ef8780bc79c911f6cbbc0e9645d68a6515335bca54f4f70e690c762af20286

data/docs/what_tests_can_be_run.md

@@ -82,6 +82,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_INFLUXDB_URL` |- | Influxdb url for test metrics reporting | No|
 | `QA_INFLUXDB_TOKEN` |- | Influxdb token for test metrics reporting | No|
 | `QA_RUN_TYPE` |- | QA run type like `staging-full`, `canary`, `production` etc. Used in test metrics reporting | No|
+| `QA_VALIDATE_RESOURCE_REUSE` | `false` | Set to `true` to [validate resource reuse](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/resources.html#reusable-resources) after a test suite | No |
 | `GITHUB_USERNAME` |-  | Username for authenticating with GitHub. | No|
 | `GITHUB_PASSWORD` |-  | Password for authenticating with GitHub. | No|
 | `GITLAB_QA_LOOP_RUNNER_MINUTES` | `1` | Minutes to run and repeat a spec while using the '--loop' option; default value is 1 minute. | No|

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

@@ -25,7 +25,7 @@ module Gitlab
           end
 
           issue = gitlab.create_issue(
-            title: "#{Time.now.strftime('%Y-%m-%d')} Test session report | #{pipeline}",
+            title: "#{Time.now.strftime('%Y-%m-%d')} Test session report | #{Runtime::Env.qa_run_type}",
             description: generate_description(tests),
             labels: ['Quality', 'QA', 'triage report', pipeline_name_label]
           )
@@ -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

@@ -42,6 +42,7 @@ module Gitlab
           'QA_INFLUXDB_TOKEN' => :qa_influxdb_token,
           'QA_RUN_TYPE' => :qa_run_type,
           'QA_SKIP_PULL' => :qa_skip_pull,
+          'QA_VALIDATE_RESOURCE_REUSE' => :qa_validate_resource_reuse,
           'GITLAB_API_BASE' => :api_base,
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_ADMIN_PASSWORD' => :admin_password,
@@ -306,6 +307,23 @@ module Gitlab
           enabled?(env_var_value_if_defined('QA_EXPORT_TEST_METRICS'), default: true)
         end
 
+        def qa_run_type
+          return env_var_value_if_defined('QA_RUN_TYPE') if env_var_value_valid?('QA_RUN_TYPE')
+
+          live_envs = %w[staging staging-canary staging-ref canary preprod production]
+          return unless live_envs.include?(ci_project_name)
+
+          test_subset = if env_var_value_if_defined('NO_ADMIN') == 'true'
+                          'sanity-no-admin'
+                        elsif env_var_value_if_defined('SMOKE_ONLY') == 'true'
+                          'sanity'
+                        else
+                          'full'
+                        end
+
+          "#{ci_project_name}-#{test_subset}"
+        end
+
         private
 
         def enabled?(value, default: true)

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.22.0'
+    VERSION = '7.23.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.22.0
+  version: 7.23.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-02-23 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