gitlab-qa 6.10.0 → 6.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7b24a0d671a29568447a0db95b57a06c43ed750d220dc13a0ad8216b7ba6297
-  data.tar.gz: 9e03938be0b67f4f9a522703156bfc1b191ac0b8b97661c5eb74b82bfd91c84f
+  metadata.gz: f7798682f401a1349003d47532109adc5523cca0d4dfb43a0036669d0432168f
+  data.tar.gz: eaa7d08e48b241b2d2a521f493543f40beebaef4dcb86e04584eb34cbfbba1c8
 SHA512:
-  metadata.gz: 21ea402dd74ab453e9ac303303f50925a32a82e58b7e4ff0aa57721d4e8301717febc4da56b1b5b3c7141ad7f0e613b56fc7d47b7a25256b83f07ec53980db33
-  data.tar.gz: e31d991f0f78bfc510dbaafb3a844126d95c2e46655b2d655c256dcdfda673ca8038085c33deb65caa00728effb63e75020e3f6c217ddc697e87ceaded1270ba
+  metadata.gz: fd9312eb0cf93c3ec671b1115d96ae3926fe977de8c11134817fa90cdfb431b88015ce0c28dab8009492f7a14cba173ec13ffca8e466115e37e1b547f5cbe56d
+  data.tar.gz: cd2810c3e560b25337835d9f8e324549bff222cd45529ae7bd372351284a7080c33aaa611bfe95605f2cb12b3a7c958f272436d2e587b98fa8a425cdfdccfd90

data/.gitlab-ci.yml

@@ -49,9 +49,9 @@ variables:
   QA_CAN_TEST_GIT_PROTOCOL_V2: "true"
   QA_CAN_TEST_PRAEFECT: "false"
   QA_TESTCASES_REPORTING_PROJECT: "gitlab-org/quality/testcases"
-  QA_FAILURES_REPORTING_PROJECT: "gitlab-org/gitlab"
+  QA_FAILURES_REPORTING_PROJECT: "rymai/gitlab-qa-issues"
   # The --dry-run or --max-diff-ratio option can be set to modify the behavior of `exe/gitlab-qa-report --relate-failure-issue` without releasing a new gem version.
-  QA_FAILURES_REPORTER_OPTIONS: "--dry-run"
+  QA_FAILURES_REPORTER_OPTIONS: ""
   QA_TESTCASE_SESSIONS_PROJECT: "gitlab-org/quality/testcase-sessions"
 
 .check-base:

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

@@ -109,6 +109,9 @@ module Gitlab
           pipeline = QA::Runtime::Env.pipeline_from_project_name
           channel = pipeline == "canary" ? "qa-production" : "qa-#{pipeline}"
           error_msg = warn_exception(e)
+
+          return unless QA::Runtime::Env.ci_commit_ref_name == 'master'
+
           slack_options = {
             channel: channel,
             icon_emoji: ':ci_failing:',

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

@@ -10,7 +10,7 @@ module Gitlab
       # Uses the API to create or update GitLab issues with the results of tests from RSpec report files.
       class RelateFailureIssue < ReportAsIssue
         DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION = 0.05
-        STACKTRACE_REGEX = %r{### Stack trace\s*(```)\s*.*(Failure/Error: .+)(\1)}m.freeze
+        STACKTRACE_REGEX = %r{### Stack trace\s*(```)\s*.*(Failure/Error:.+)(\1)}m.freeze
         NEW_ISSUE_LABELS = Set.new(%w[QA Quality test failure::investigating priority::2]).freeze
 
         MultipleIssuesFound = Class.new(StandardError)
@@ -47,6 +47,7 @@ module Gitlab
             issue = find_or_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
@@ -123,13 +124,38 @@ module Gitlab
         end
 
         def new_issue_description(test)
-          super + "\n\n### Stack trace\n\n```\n#{test.failures.first['message_lines'].join("\n")}\n```"
+          super + [
+            "\n\n### Stack trace",
+            "```\n#{test.failures.first['message_lines'].join("\n")}\n```",
+            "First happened in #{test.ci_job_url}."
+          ].join("\n\n")
+        end
+
+        def deploy_environment_label
+          environment = Runtime::Env.deploy_environment
+
+          case environment
+          when 'production'
+            'found:gitlab.com'
+          when 'canary', 'staging'
+            "found:#{environment}.gitlab.com"
+          when 'preprod'
+            'found:pre.gitlab.com'
+          when 'staging-orchestrated', 'nightly', 'master'
+            "found:#{environment}"
+          else
+            raise "No `found:*` label for the `#{environment}` environment!"
+          end
         end
 
         def new_issue_labels(test)
           NEW_ISSUE_LABELS + up_to_date_labels(test: test)
         end
 
+        def up_to_date_labels(test:, issue: nil)
+          super << deploy_environment_label
+        end
+
         def post_failed_job_note(issue, test)
           gitlab.create_issue_note(iid: issue.iid, note: "/relate #{test.testcase}")
         end

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

@@ -25,8 +25,6 @@ module Gitlab
         end
 
         def report_test(test)
-          return if test.skipped
-
           puts "Reporting test: #{test.file} | #{test.name}"
 
           issue = find_issue(test)
@@ -34,16 +32,19 @@ module Gitlab
           if issue
             puts "Found existing issue: #{issue.web_url}"
           else
+            # Don't create new issues for skipped tests
+            return if test.skipped
+
             issue = create_issue(test)
             puts "Created new issue: #{issue.web_url}"
           end
 
           test.testcase ||= issue.web_url
 
-          update_labels(issue, test)
+          labels_updated = update_labels(issue, test)
           note_posted = note_status(issue, test)
 
-          if note_posted
+          if labels_updated || note_posted
             puts "Issue updated."
           else
             puts "Test passed, no update needed."
@@ -83,6 +84,7 @@ module Gitlab
         end
 
         def note_status(issue, test)
+          return false if test.skipped
           return false if test.failures.empty?
 
           note = note_content(test)

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

@@ -139,6 +139,10 @@ module Gitlab
           ENV['CI_PROJECT_NAME']
         end
 
+        def ci_commit_ref_name
+          ENV['CI_COMMIT_REF_NAME']
+        end
+
         def pipeline_from_project_name
           if ci_project_name.to_s.start_with?('gitlab-qa')
             if ENV['TOP_UPSTREAM_SOURCE_JOB'].to_s.start_with?('https://ops.gitlab.net')

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.10.0'.freeze
+    VERSION = '6.10.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.10.0
+  version: 6.10.1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control