gitlab-qa 7.24.5 → 7.24.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f574050bbfc1f6ede0a0bb9f87b5e5c1e8f5403739f56294cae2fb1e60fccc
-  data.tar.gz: 57a53ed8a9e1f1071a38bfb96ad46ed13fd566023ac9460751f0dc3da4874291
+  metadata.gz: 1ab5663ab224b79f77ee02d363fa0e38d5a14f53e895b5135e87a79e91ebb89a
+  data.tar.gz: 0b42e0776e042612565fe7e55af86db3dd3559dcdce549e4d937948e55173f81
 SHA512:
-  metadata.gz: da89e0ab1a89cefa915d6b734867a78fd6d8e66725d9ba75dac1eeae8faa007cf7fd8fe97372a5f5919a08a8cc482694cc2d9eab25083fc5502d26c3425e082e
-  data.tar.gz: a293a8034877b7f64718e18969809e25dac26943667aafed41e93a433677369ee956707d447234c3d75d5112011d9423a9f4f46102ad4817f833122004d3f560
+  metadata.gz: a9046b2ee0a0a41d289a3551c4fe5179198b86854bcda525b1bc25915f5cc43f1b2d43f7197f077b55a43dd92bd3e40cd38c5d672bff4aa8b3c166933f7bd941
+  data.tar.gz: c3b2491338c9a433cf3cf1ae83864484e1f769cc3626497e2ef2e3b37717b1a58b481aec74fe37024ed7a18e7cd80364f749f6d9cab481a761c81b16aaab2cd8

data/.gitlab-ci.yml

@@ -820,7 +820,7 @@ ee:object_storage-quarantine:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config object_storage"
     QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
 
-ee:packages:
+ee:packages-parallel:
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
@@ -828,6 +828,7 @@ ee:packages:
     - .ee-variables
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
+  parallel: 2
   variables:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config packages"
     QA_RSPEC_TAGS: "--tag packages"
@@ -1388,3 +1389,7 @@ include:
       - '/ci/gem-release.yml'
       - '/ci/allure-report.yml'
       - '/ci/knapsack-report.yml'
+      - '/ci/danger-review.yml'
+
+danger-review:
+  stage: check

data/Dangerfile

@@ -1,9 +1,7 @@
 require 'gitlab-dangerfiles'
 
 Gitlab::Dangerfiles.for_project(self) do |dangerfiles|
-  # Import all plugins from the gem
   dangerfiles.import_plugins
 
-  # Import only a subset of rules
-  dangerfiles.import_dangerfiles(only: %w[changes_size commit_messages simple_roulette])
+  dangerfiles.import_dangerfiles(except: %w[changelog])
 end

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

@@ -86,14 +86,16 @@ module Gitlab
           ld = Class.new.extend(Gem::Text).method(:levenshtein_distance)
           full_stacktrace = test.failures.first['message_lines'].join("\n")
           first_test_failure_stacktrace = sanitize_stacktrace(full_stacktrace, FAILURE_STACKTRACE_REGEX) || full_stacktrace
+          clean_first_test_failure_stacktrace = remove_unique_resource_names(first_test_failure_stacktrace)
 
           # Search with the `search` param returns 500 errors, so we filter by ~QA and then filter further in Ruby
           failure_issues(test).each_with_object({}) do |issue, memo|
             relevant_issue_stacktrace = find_issue_stacktrace(issue)
             next unless relevant_issue_stacktrace
 
-            distance = ld.call(first_test_failure_stacktrace, relevant_issue_stacktrace)
-            diff_ratio = distance.zero? ? 0.0 : (distance.to_f / first_test_failure_stacktrace.size).round(3)
+            clean_relevant_issue_stacktrace = remove_unique_resource_names(relevant_issue_stacktrace)
+            distance = ld.call(clean_first_test_failure_stacktrace, clean_relevant_issue_stacktrace)
+            diff_ratio = distance.zero? ? 0.0 : (distance.to_f / clean_first_test_failure_stacktrace.size).round(3)
 
             if diff_ratio <= max_diff_ratio
               puts "  => [DEBUG] Issue #{issue.web_url} has an acceptable diff ratio of #{(diff_ratio * 100).round(2)}%."
@@ -128,6 +130,10 @@ module Gitlab
           end
         end
 
+        def remove_unique_resource_names(stacktrace)
+          stacktrace.gsub(/qa-(test|user)-[a-z0-9-]+/, '<unique-test-resource>').gsub(/(?:-|_)(?:\d+[a-z]|[a-z]+\d)[a-z\d]{4,}/, '<unique-hash>')
+        end
+
         def find_failure_issue(test)
           relevant_issues = find_relevant_failure_issues(test)
 

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.24.5'
+    VERSION = '7.24.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.24.5
+  version: 7.24.6
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -218,7 +218,6 @@ files:
 - ".dockerignore"
 - ".gitignore"
 - ".gitlab-ci.yml"
-- ".gitlab/ci/danger.gitlab-ci.yml"
 - ".gitlab/ci/rules.gitlab-ci.yml"
 - ".gitlab/issue_templates/Default.md"
 - ".gitlab/merge_request_templates/Default.md"

data/.gitlab/ci/danger.gitlab-ci.yml

@@ -1,25 +0,0 @@
-danger-review:
-  image: ruby:3.0
-  stage: check
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-  needs: []
-  retry:
-    max: 2
-    when:
-      - unknown_failure
-      - api_failure
-      - runner_system_failure
-      - stuck_or_timeout_failure
-  before_script:
-    - bundle install
-  script:
-    - >
-      if [ -z "$DANGER_GITLAB_API_TOKEN" ]; then
-        # Force danger to skip CI source GitLab and fallback to "local only git repo".
-        unset GITLAB_CI
-        # We need the base SHA of the merge request diff to help danger determine the base commit for this shallow clone.
-        bundle exec danger dry_run --fail-on-errors=true --verbose --base='$CI_MERGE_REQUEST_DIFF_BASE_SHA' --head='${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA:-$CI_COMMIT_SHA}'
-      else
-        bundle exec danger --fail-on-errors=true --verbose
-      fi