gitlab-qa 6.12.0 → 6.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7db5ca406c7143f6b4b8ac2d5061080f52157dbe77f23459fdf15919cc24209
-  data.tar.gz: b0dca304397f7c373ca94b41936f8d04db818b797dc9a09e05e31accfd8a9cfd
+  metadata.gz: 946c39f638a57c7e2a1ba24dffe836a3b124b0e12dd3b8c18b07a73a5626282a
+  data.tar.gz: 3d8adfbf3589e92ad6aaeafa535bc679bad341202eab354ff842e518116b758a
 SHA512:
-  metadata.gz: 25678e888d7a338ef9f54269927e16ab6d5f60bc4b37175185bda64174689d9aecf40ac35c7d31be15e6fb1305527604f4667f09aa6c89f42ba4e02c7187a68d
-  data.tar.gz: ff1c2808b0030677ba8420444e4cb303b0d58d6751511bef90a8bcbea98df6a98e1efea83945d7b6488f076eb8f978519198b4938dc9b99503bd97c0d2b9ea57
+  metadata.gz: cd31b62d6d3b78d6384f1884f9f210d95c4cebcb4704a7eb9c2e652180a1d029e8f567addeec03ede879d27dc8de42a297cf3be7e4d8e8ad4899d612243c0e6d
+  data.tar.gz: 304ee3fa3f5bb12d1c3f4064f8d3aa3b573bb95ea511648ac391023991884fc220f8fb0fbdca2a70dba9ab82903d37b60c7068558f529251a49f039f012fffc3

data/.gitlab-ci.yml

@@ -1,8 +1,8 @@
 stages:
   - check
-  - release
   - test
   - report
+  - deploy
   - notify
 
 default:
@@ -35,13 +35,6 @@ workflow:
     # For triggers from GitLab MR pipelines (and pipelines from other projects), create a pipeline
     - if: '$CI_PIPELINE_SOURCE == "pipeline"'
 
-.default-rules:
-  rules:
-    - if: '$CI_COMMIT_TAG || $RELEASE'
-      when: never
-    - if: '$RELEASE == null && $CI_JOB_NAME =~ /staging/'
-      when: manual
-
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375
@@ -65,21 +58,6 @@ rubocop:
 rspec:
   extends: .check-base
 
-release:
-  stage: release
-  rules:
-    - if: '$CI_COMMIT_TAG'
-  script:
-    - gem update --system
-    - ruby --version
-    - gem env version
-    - gem build gitlab-qa.gemspec
-    - gem push gitlab-qa*.gem
-  artifacts:
-    paths:
-      - gitlab-qa*.gem
-    expire_in: 30 days
-
 .test:
   stage: test
   services:
@@ -107,6 +85,10 @@ release:
   variables:
     DEFAULT_RELEASE: "CE"
   rules:
+    # Don't run E2E jobs on release pipelines
+    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
+      changes: ["lib/**/version.rb"]
+      when: never
     - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/'
       when: never
     - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/'
@@ -121,6 +103,10 @@ release:
   variables:
     DEFAULT_RELEASE: "EE"
   rules:
+    # Don't run E2E jobs on release pipelines
+    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
+      changes: ["lib/**/version.rb"]
+      when: never
     - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/'
       when: never
     - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/'
@@ -132,7 +118,15 @@ release:
     - if: '$RELEASE == null || $RELEASE =~ /gitlab-ee/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
 
 .only-qa:
-  extends: .default-rules
+  rules:
+    # Don't run E2E jobs on release pipelines
+    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
+      changes: ["lib/**/version.rb"]
+      when: never
+    - if: '$CI_COMMIT_TAG || $RELEASE'
+      when: never
+    - if: '$RELEASE == null && $CI_JOB_NAME =~ /staging/'
+      when: manual
 
 .high-capacity:
   tags:
@@ -1012,3 +1006,7 @@ notify_slack:
     - echo "CI_PIPELINE_URL is $CI_PIPELINE_URL"
     - echo "TOP_UPSTREAM_SOURCE_JOB is $TOP_UPSTREAM_SOURCE_JOB"
     - 'bin/slack $NOTIFY_CHANNEL "☠️ QA against $RELEASE failed! ☠️ See the test session report: $(cat REPORT_ISSUE_URL), and pipeline: $CI_PIPELINE_URL (triggered from $TOP_UPSTREAM_SOURCE_JOB)" ci_failing'
+
+include:
+  - project: 'gitlab-org/quality/pipeline-common'
+    file: '/ci/gem-release.yml'

data/.gitlab/merge_request_templates/Release.md

@@ -30,6 +30,6 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-qa/commits/mast
   - [ ] Release notes are accurate.
 
 - Checklist after merging:
-  - [ ] [Create a tag for the new release version](docs/release_process.md#how-to).
+  - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
 
 /label ~Quality ~"feature::maintenance"

data/docs/release_process.md

@@ -24,12 +24,13 @@ when we make a change - no matter the size of the change.
   - If not, update [`lib/gitlab/qa/version.rb`] to an appropriate [semantic version](https://semver.org) in a new merge request using the [release template](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/.gitlab/merge_request_templates/Release.md)
     and title the MR like `"Bump version to <version>"`.
 - Merge the merge request.
-- Create a new tag via the UI (https://gitlab.com/gitlab-org/gitlab-qa/-/tags/new).
-  * **Tag name**: The same version found in [`lib/gitlab/qa/version.rb`], prefixed with `v`, e.g. if the version is `4.7.1`, the tag would be `v4.7.1`.
-  * **Message**: Set it to "Version x.y.z", e.g. if the version is `4.7.1`, the message would be "Version 4.7.1".
+- The new version should automatically be tagged and pushed to Rubygems by the `gem-release` job in the merge commit pipeline.
+- Update the release notes for the newly created tag (https://gitlab.com/gitlab-org/gitlab-qa/-/tags):
   * **Release notes**: Copy the release notes from the merge request.
-  * Click *Create Tag*.
-  
-GitLab will then start a pipeline for this new tag, and the `release` job will build and push the new version of `gitlab-qa` to RubyGems.
+
+Note: The `gem-release` job uses:
+
+- the `GITLAB_API_TOKEN` environment variable to authenticate against GitLab.com's API in order to create the tag
+- the `GEM_HOST_API_KEY` environment variable to authenticate against Rubygems.org's API in order to release the gem
 
 [`lib/gitlab/qa/version.rb`]: https://gitlab.com/gitlab-org/gitlab-qa/blob/master/lib/gitlab/qa/version.rb#L3

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

@@ -6,6 +6,7 @@ module Gitlab
       class GenerateTestSession < ReportAsIssue
         private
 
+        # rubocop:disable Metrics/AbcSize
         def run!
           puts "Generating test results in `#{files.join(',')}` as issues in project `#{project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
 
@@ -16,22 +17,26 @@ module Gitlab
           end
 
           issue = gitlab.create_issue(
-            title: "Test session report | #{Runtime::Env.deploy_environment}",
+            title: "Test session report | #{pipeline}",
             description: generate_description(tests),
-            labels: ['Quality', 'QA', 'triage report']
+            labels: ['Quality', 'QA', 'triage report', pipeline_name_label]
           )
 
           File.write('REPORT_ISSUE_URL', issue.web_url)
         end
+        # rubocop:enable Metrics/AbcSize
 
         def generate_description(tests)
           <<~MARKDOWN
           ## Session summary
 
           * Deploy version: #{Runtime::Env.deploy_version}
-          * Pipeline: [#{Runtime::Env.ci_pipeline_id}](#{Runtime::Env.ci_pipeline_url})
+          * Deploy environment: #{Runtime::Env.deploy_environment}
+          * Pipeline: #{Runtime::Env.pipeline_from_project_name} [#{Runtime::Env.ci_pipeline_id}](#{Runtime::Env.ci_pipeline_url})
           #{generate_summary(tests: tests)}
 
+          #{generate_failed_jobs_listing}
+
           #{generate_stages_listing(tests)}
 
           ## Release QA issue
@@ -55,6 +60,33 @@ module Gitlab
           MARKDOWN
         end
 
+        def generate_failed_jobs_listing
+          failed_jobs = []
+
+          client = Gitlab.client(
+            endpoint: Runtime::Env.ci_api_v4_url,
+            private_token: Runtime::Env.gitlab_ci_api_token)
+
+          gitlab.handle_gitlab_client_exceptions do
+            failed_jobs = client.pipeline_jobs(
+              Runtime::Env.ci_project_id,
+              Runtime::Env.ci_pipeline_id,
+              scope: 'failed')
+          end
+
+          listings = failed_jobs.map do |job|
+            allowed_to_fail = ' (allowed to fail)' if job.allow_failure
+
+            "* [#{job.name}](#{job.web_url})#{allowed_to_fail}"
+          end.join("\n")
+
+          <<~MARKDOWN.chomp if failed_jobs.any?
+          ## Failed jobs
+
+          #{listings}
+          MARKDOWN
+        end
+
         def generate_stages_listing(tests)
           generate_tests_by_stage(tests).map do |stage, tests_for_stage|
             tests_by_status = tests_for_stage.group_by(&:status)
@@ -185,7 +217,7 @@ module Gitlab
               tests_with_same_testcase.select(&:failure_issue)
 
             if tests_having_failure_issue.any?
-              items = tests_having_failure_issue.map do |test|
+              items = tests_having_failure_issue.uniq(&:failure_issue).map do |test|
                 "<li>[ ] [failure issue](#{test.failure_issue})</li>"
               end.join(' ')
 

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

@@ -34,7 +34,10 @@ module Gitlab
               #  /qa/specs/features/ee/api/<stage>
               #  /qa/specs/features/ee/browser_ui/<stage>
               # For now we assume the Stage is whatever follows api/ or browser_ui/
-              stage = strip_number_prefix(test['file'].match(%r{(api|browser_ui)/([a-z0-9_]+)}i)[2])
+              test_path_match = test['file'].match(%r{(api|browser_ui)/([a-z0-9_]+)}i)
+              next unless test_path_match
+
+              stage = strip_number_prefix(test_path_match[2])
               testcases[stage] = [] unless testcases.key?(stage)
               testcases[stage] << test
             end

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

@@ -88,7 +88,12 @@ module Gitlab
             diff_ratio = (distance.to_f / first_test_failure_stacktrace.size).round(3)
             if diff_ratio <= max_diff_ratio
               puts "  => [DEBUG] Issue #{issue} has an acceptable diff ratio of #{(diff_ratio * 100).round(2)}%."
-              memo[issue] = diff_ratio
+              # The `Gitlab::ObjectifiedHash` class overrides `#hash` which is used by `Hash#[]=` to compute the hash key.
+              # This leads to a `TypeError Exception: no implicit conversion of Hash into Integer` error, so we convert the object to a hash before using it as a Hash key.
+              # See:
+              # - https://gitlab.com/gitlab-org/gitlab-qa/-/merge_requests/587#note_453336995
+              # - https://github.com/NARKOZ/gitlab/commit/cbdbd1e32623f018a8fae39932a8e3bc4d929abb?_pjax=%23js-repo-pjax-container#r44484494
+              memo[issue.to_h] = diff_ratio
             else
               puts "  => [DEBUG] Found issue #{issue.web_url} but stacktraces are too different (#{(diff_ratio * 100).round(2)}%)."
             end
@@ -116,6 +121,9 @@ module Gitlab
             raise(MultipleIssuesFound, %(Too many issues found for test '#{test.name}' (`#{test.file}`)!))
           end
 
+          # Re-instantiate a `Gitlab::ObjectifiedHash` object after having converted it to a hash in #find_relevant_failure_issues above.
+          best_matching_issue = Gitlab::ObjectifiedHash.new(best_matching_issue)
+
           test.failure_issue ||= best_matching_issue.web_url
 
           [best_matching_issue, smaller_diff_ratio]
@@ -129,29 +137,12 @@ module Gitlab
           ].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
+          super << pipeline_name_label
         end
 
         def post_failed_job_note(issue, test)

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

@@ -104,6 +104,21 @@ module Gitlab
           labels
         end
 
+        def pipeline_name_label
+          case pipeline
+          when 'production'
+            'found:gitlab.com'
+          when 'canary', 'staging'
+            "found:#{pipeline}.gitlab.com"
+          when 'preprod'
+            'found:pre.gitlab.com'
+          when 'staging-orchestrated', 'nightly', 'master'
+            "found:#{pipeline}"
+          else
+            raise "No `found:*` label for the `#{pipeline}` pipeline!"
+          end
+        end
+
         def ee_test?(test)
           test.file =~ %r{features/ee/(api|browser_ui)}
         end

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

@@ -116,6 +116,14 @@ module Gitlab
           ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
         end
 
+        def gitlab_ci_api_token
+          ENV['GITLAB_CI_API_TOKEN']
+        end
+
+        def ci_api_v4_url
+          ENV['CI_API_V4_URL']
+        end
+
         def ci_job_name
           ENV['CI_JOB_NAME']
         end
@@ -136,8 +144,8 @@ module Gitlab
           ENV['CI_PIPELINE_ID']
         end
 
-        def ci_project_name
-          ENV['CI_PROJECT_NAME']
+        def ci_project_id
+          ENV['CI_PROJECT_ID']
         end
 
         def ci_commit_ref_name

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.12.0'.freeze
+    VERSION = '6.15.2'.freeze
   end
 end

metadata

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