gitlab-qa 7.14.0 → 7.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e034576001af3b45e773e20fcbef82cc68776e5cf5cfc05d5b3364222daaca1a
-  data.tar.gz: 32b55a91955bda342e75a02500a32bee30afba00f88f1fc9beaf7047c8168743
+  metadata.gz: 025a32906db8c2ddc296e638c08d4d78e3d9d4dcb2c80c2b1a28772e819e8748
+  data.tar.gz: 4c7e61f511f27a75e4e035553f72fb38aab26460b0ead21c3574acb2a9b1a2c4
 SHA512:
-  metadata.gz: d70b63b685d3f8d664dcd5b9b11f249bab07869045ce6c9012a94e17f2f0f789011ca398f566019d81da255043a47813751461f5f4aba25678cc1856841e0f63
-  data.tar.gz: 2c7e1a97dce74b729720acac3b88c85b1986cd8991eaf1af736a8c0d469e2565f354155ddea493865a8949a0948a9abac770000e71a99543c5065f0c5a4470e2
+  metadata.gz: 18ec099f17557d2bf50b270b5e086f81952fca84aa3ffa9a8b376d3fcd19a08ab770405a85118be35f642e0d3097898b8f0fb9cfc3339eabf95eaa0b4207d6ad
+  data.tar.gz: 5122d793ec7d8e2c4dfd8a29157e03f1595984bf83041c0c010971917e70a6180c06b81ec6b6d601a9a15a235ad312d9caa14ba241c70d348f450d725b7756c5

data/.gitlab-ci.yml

@@ -46,7 +46,8 @@ variables:
   QA_CAN_TEST_GIT_PROTOCOL_V2: "true"
   QA_CAN_TEST_PRAEFECT: "false"
   QA_GENERATE_ALLURE_REPORT: "true"
-  QA_TESTCASES_REPORTING_PROJECT: "gitlab-org/quality/testcases"
+  QA_TESTCASES_REPORTING_PROJECT: "gitlab-org/gitlab"
+  QA_TEST_RESULTS_ISSUES_PROJECT: "gitlab-org/quality/testcases"
   QA_TESTCASE_SESSIONS_PROJECT: "gitlab-org/quality/testcase-sessions"
   # QA_DEFAULT_BRANCH is the default branch name of the instance under test.
   QA_DEFAULT_BRANCH: "master"
@@ -66,6 +67,7 @@ rspec:
 
 .test:
   stage: test
+  timeout: 1 hour 30 minutes
   services:
     - docker:20.10.5-dind
   tags:
@@ -83,7 +85,7 @@ rspec:
     - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
     - bundle exec exe/gitlab-qa-report --update-screenshot-path "gitlab-qa-run-*/**/rspec-*.xml"
     - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
+    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-results "gitlab-qa-run-*/**/rspec-*.json" --test-case-project "$QA_TESTCASES_REPORTING_PROJECT" --results-issue-project "$QA_TEST_RESULTS_ISSUES_PROJECT" || true; fi
     - exit $test_run_exit_code
 
 # For jobs that shouldn't report results in issues, e.g., manually run custom jobs
@@ -106,7 +108,7 @@ rspec:
     - bundle exec exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=$DEFAULT_RELEASE} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
     - bundle exec exe/gitlab-qa-report --update-screenshot-path "gitlab-qa-run-*/**/rspec-*.xml"
     - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
+    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-results "gitlab-qa-run-*/**/rspec-*.json" --test-case-project "$QA_TESTCASES_REPORTING_PROJECT" --results-issue-project "$QA_TEST_RESULTS_ISSUES_PROJECT" || true; fi
     - exit $test_run_exit_code
 
 .ce-variables:
@@ -527,6 +529,26 @@ ee:mattermost-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Mattermost"
 
+ce:service_ping_disabled:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"
+
+ee:service_ping_disabled:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"
+
 # Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/gitlab/-/issues/273063
 # ee:geo:
 #   extends:
@@ -1066,6 +1088,7 @@ ce:gitaly-cluster:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ce:gitaly-cluster-quarantine:
   extends:
@@ -1077,6 +1100,7 @@ ce:gitaly-cluster-quarantine:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ee:gitaly-cluster:
   extends:
@@ -1087,6 +1111,7 @@ ee:gitaly-cluster:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ee:gitaly-cluster-quarantine:
   extends:
@@ -1098,6 +1123,7 @@ ee:gitaly-cluster-quarantine:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
+    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ce:mtls:
   extends:

data/docs/run_qa_against_gdk.md

@@ -49,6 +49,16 @@ make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
 **Note:** The hostname of the URL provided to `gitlab-qa` must match the hostname configured for GDK.
 If they do not match, a test will be signed out when it visits a page directly because the hostname of the URL visited will be different from the hostname that was used when signing in.
 
+**Note:** When you log into your GDK instance of GitLab for the first time, the root password requires a change.
+GitLab QA expects the default initial password to be used in tests; see all default values listed in
+[Supported GitLab environment variables](what_tests_can_be_run.md#supported-gitlab-environment-variables).
+If you have changed your root password, you must set the `GITLAB_INITIAL_ROOT_PASSWORD` environment
+variable.
+
+```
+export GITLAB_INITIAL_ROOT_PASSWORD="<GDK root password>"
+```
+
 ### Running EE tests
 
 When running EE tests you'll need to have a license available. GitLab engineers can [request a license](https://about.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee).
@@ -101,7 +111,7 @@ your DNS and point to the IP/port of `dnsdock` application.
 
 ### Docker on macOS caveats
 
-When using OS X Docker, you need to go to Preferences > Advanced and allocate at least **5.0 GB**,
+When using OS X Docker, you need to go to Preferences > Resources > Advanced and allocate at least **5.0 GB**,
 otherwise some steps may fail to execute the `chrome-webdriver`.
 
 When using docker-machine, see [this StackOverflow link for increasing memory](https://stackoverflow.com/questions/32834082/how-to-increase-docker-machine-memory-mac/36982696#36982696).

data/docs/what_tests_can_be_run.md

@@ -62,6 +62,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_ARTIFACTS_DIR` |`/tmp/gitlab-qa`| Path to a directory where artifacts (logs and screenshots) for failing tests will be saved. | No|
 | `DOCKER_HOST` |`http://localhost`| Docker host to run tests against. | No|
 | `WEBDRIVER_HEADLESS` |-  | When running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run. | No|
+| `CHROME_DISABLE_DEV_SHM` | `false` | Set to `true` to disable `/dev/shm` usage in Chrome on Linux. | No|
 | `QA_ADDITIONAL_REPOSITORY_STORAGE` |-  | The name of additional, non-default storage to be used with tests tagged `repository_storage`, run via the `Test::Instance::RepositoryStorage` scenario.  Note: Admin access is required to change repository storage. | No|
 | `QA_PRAEFECT_REPOSITORY_STORAGE` |-  | The name of repository storage using Praefect. Note: Admin access is required to change repository storage. | No|
 | `QA_COOKIES` |-  | Optionally set to "cookie1=value;cookie2=value" in order to add a cookie to every request. This can be used to set the canary cookie by setting it to "gitlab_canary=true". | No|

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

@@ -21,6 +21,7 @@ module Gitlab
             command << "--publish 9300:9300"
 
             command.env("discovery.type", "single-node")
+            command.env("ES_JAVA_OPTS", "-Xms512m -Xmx512m")
           end
         end
       end

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

@@ -6,6 +6,11 @@ module Gitlab
   module QA
     module Report
       class GenerateTestSession < ReportAsIssue
+        def initialize(**kwargs)
+          super
+          @issue_type = 'issue'
+        end
+
         private
 
         # rubocop:disable Metrics/AbcSize

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

@@ -19,6 +19,7 @@ module Gitlab
         def initialize(max_diff_ratio: DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION, **kwargs)
           super
           @max_diff_ratio = max_diff_ratio.to_f
+          @issue_type = 'issue'
         end
 
         private
@@ -63,7 +64,7 @@ module Gitlab
             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 "  => Created new issue: #{issue.web_url} for test '#{test.name}'." if issue
+            puts "for test '#{test.name}'."
           end
 
           issue

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

@@ -22,7 +22,7 @@ module Gitlab
 
         private
 
-        attr_reader :gitlab, :files, :project
+        attr_reader :gitlab, :files, :project, :issue_type
 
         def run!
           raise NotImplementedError
@@ -77,11 +77,18 @@ module Gitlab
         end
 
         def create_issue(test)
-          gitlab.create_issue(
+          issue = gitlab.create_issue(
             title: title_from_test(test),
             description: new_issue_description(test),
-            labels: new_issue_labels(test).to_a
+            labels: new_issue_labels(test).to_a,
+            issue_type: issue_type
           )
+
+          new_link = issue_type == 'test_case' ? issue.web_url.sub('/issues/', '/quality/test_cases/') : issue.web_url
+
+          puts "Created new #{issue_type}: #{new_link}"
+
+          issue
         end
 
         def issue_labels(issue)

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

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Report
+      # Uses the API to create or update GitLab test cases and issues with the results of tests from RSpec report files.
+      class ReportResults < ReportAsIssue
+        # TODO: Remove old_testcase_project_reporter once all test case links are updated to the gitlab project. See https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1079
+        attr_accessor :testcase_project_reporter, :results_issue_project_reporter, :files, :test_case_project, :results_issue_project, :gitlab, :old_testcase_project_reporter
+
+        def initialize(token:, input_files:, test_case_project:, results_issue_project:, dry_run: false, **kwargs)
+          @testcase_project_reporter = Gitlab::QA::Report::ResultsInTestCases.new(token: token, input_files: input_files, project: test_case_project, dry_run: dry_run, **kwargs)
+          # TODO: Remove the line below once all test case links are updated to the gitlab project. See https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1079
+          @old_testcase_project_reporter = Gitlab::QA::Report::ResultsInTestCases.new(token: token, input_files: input_files, project: results_issue_project, dry_run: dry_run, **kwargs)
+          @results_issue_project_reporter = Gitlab::QA::Report::ResultsInIssues.new(token: token, input_files: input_files, project: results_issue_project, dry_run: dry_run, **kwargs)
+          @test_case_project = test_case_project
+          @results_issue_project = results_issue_project
+          @files = Array(input_files)
+          @gitlab = testcase_project_reporter.gitlab
+        end
+
+        def assert_project!
+          return if test_case_project && results_issue_project
+
+          abort "Please provide valid project IDs or paths with the `--results-issue-project` and `--test-case-project` options!"
+        end
+
+        def run!
+          puts "Reporting test results in `#{files.join(',')}` as test cases in project `#{test_case_project}`"\
+               " and issues in project `#{results_issue_project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
+
+          test_results_per_file do |test_results|
+            puts "Reporting tests in #{test_results.path}"
+
+            test_results.each do |test|
+              puts "Reporting test: #{test.file} | #{test.name}\n"
+
+              report_test(test) unless test.skipped
+            end
+
+            test_results.write
+          end
+        end
+
+        private
+
+        def report_test(test)
+          # TODO: Remove the line below and replace correct_testcase_project_reporter with testcase_project_reporter
+          # once all test case links are updated to the gitlab project. See https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1079
+          correct_testcase_project_reporter = using_old_testcase_link(test) ? old_testcase_project_reporter : testcase_project_reporter
+
+          testcase = correct_testcase_project_reporter.find_or_create_testcase(test)
+          # The API returns the test case with an issue URL since it is technically a type of issue.
+          # This updates the URL to a valid test case link.
+          test.testcase = testcase.web_url.sub('/issues/', '/quality/test_cases/')
+
+          issue, is_new = results_issue_project_reporter.get_related_issue(testcase, test)
+
+          correct_testcase_project_reporter.add_issue_link_to_testcase(testcase, issue, test) if is_new
+
+          correct_testcase_project_reporter.update_testcase(testcase, test)
+          results_issue_project_reporter.update_issue(issue, test)
+        end
+
+        def using_old_testcase_link(test)
+          test.testcase&.include?(results_issue_project)
+        end
+      end
+    end
+  end
+end

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

@@ -1,120 +1,62 @@
 # frozen_string_literal: true
 
-require 'nokogiri'
-require 'active_support/core_ext/enumerable'
-
 module Gitlab
   module QA
     module Report
-      # Uses the API to create or update GitLab issues with the results of tests from RSpec report files.
+      # Uses the API to create or update GitLab test result issues with the results of tests from RSpec report files.
       class ResultsInIssues < ReportAsIssue
-        private
-
-        RESULTS_SECTION_TEMPLATE = "\n\n### DO NOT EDIT BELOW THIS LINE\n\nActive and historical test results:"
-
-        def run!
-          puts "Reporting test results in `#{files.join(',')}` as issues in project `#{project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
-
-          test_results_per_file do |test_results|
-            puts "Reporting tests in #{test_results.path}"
+        include ResultsReporterShared
 
-            test_results.each do |test|
-              puts "Reporting test: #{test.file} | #{test.name}\n"
-
-              report_test(test) unless test.skipped
-            end
-
-            test_results.write
-          end
+        def initialize(**kwargs)
+          super
+          @issue_type = 'issue'
         end
 
-        def report_test(test)
-          testcase = find_testcase(test) || create_testcase(test)
-          test.testcase ||= testcase.web_url.sub('/issues/', '/quality/test_cases/')
-
+        def get_related_issue(testcase, test)
           issue = find_linked_results_issue_by_iid(testcase, test)
+          is_new = false
 
           if issue
-            issue = update_issue_title(issue, test, 'issue') if issue.title.strip != title_from_test(test)
+            issue = update_issue_title(issue, test) if issue_title_needs_updating?(issue, test)
           else
             puts "No valid issue link found"
             issue = find_or_create_results_issue(test)
-
-            add_issue_to_testcase(testcase, issue)
+            is_new = true
           end
 
-          update_labels(testcase, test)
-          update_issue(issue, test)
+          [issue, is_new]
         end
 
-        def find_testcase(test)
-          testcase = find_testcase_by_iid(test)
+        def update_issue(issue, test)
+          new_labels = issue_labels(issue)
+          new_labels |= ['Testcase Linked']
 
-          if testcase
-            testcase = update_issue_title(testcase, test, 'test_case') if testcase.title.strip != title_from_test(test)
+          labels_updated = update_labels(issue, test, new_labels)
+          note_posted = note_status(issue, test)
+
+          if labels_updated || note_posted
+            puts "Issue updated."
           else
-            testcase = find_issue(test, 'test_case')
+            puts "Test passed, no results issue update needed."
           end
-
-          testcase
         end
 
-        def find_testcase_by_iid(test)
-          iid = testcase_iid_from_url(test.testcase)
-
-          return unless iid
-
-          find_issue_by_iid(iid, 'test_case')
-        end
+        private
 
         def find_linked_results_issue_by_iid(testcase, test)
           iid = issue_iid_from_testcase(testcase)
 
           return unless iid
 
-          find_issue_by_iid(iid, 'issue')
-        end
-
-        def find_issue_by_iid(iid, issue_type)
-          issues = gitlab.find_issues(iid: iid) do |issue|
-            issue.state == 'opened' && issue.issue_type == issue_type
-          end
-
-          warn(%(#{issue_type} iid "#{iid}" not valid)) if issues.empty?
-
-          issues.first
-        end
-
-        def update_issue_title(issue, test, issue_type)
-          warn(%(#{issue_type} title needs to be updated from '#{issue.title.strip}' to '#{title_from_test(test)}'))
-
-          gitlab.edit_issue(iid: issue.iid, options: { title: title_from_test(test) })
-        end
-
-        def create_testcase(test)
-          title = title_from_test(test)
-          puts "Creating test case '#{title}' ..."
-
-          gitlab.create_issue(
-            title: title,
-            description: new_testcase_description(test),
-            labels: new_issue_labels(test),
-            issue_type: 'test_case'
-          )
-        end
-
-        def testcase_iid_from_url(url)
-          return warn(%(\nPlease update #{url} to test case url")) if url&.include?('/-/issues/')
-
-          url && url.split('/').last.to_i
+          find_issue_by_iid(iid)
         end
 
-        def new_testcase_description(test)
-          "#{new_issue_description(test)}#{RESULTS_SECTION_TEMPLATE}"
+        def find_or_create_results_issue(test)
+          find_issue(test) || create_issue(test)
         end
 
         def issue_iid_from_testcase(testcase)
-          results = testcase.description.partition(RESULTS_SECTION_TEMPLATE).last if testcase.description.include?(RESULTS_SECTION_TEMPLATE)
+          results = testcase.description.partition(TEST_CASE_RESULTS_SECTION_TEMPLATE).last if testcase.description.include?(TEST_CASE_RESULTS_SECTION_TEMPLATE)
 
           return puts "No issue link found" unless results
 
@@ -123,66 +65,6 @@ module Gitlab
           issue_iid&.to_i
         end
 
-        def find_or_create_results_issue(test)
-          issue = find_issue(test, 'issue')
-
-          if issue
-            puts "Found existing issue: #{issue.web_url}"
-          else
-            issue = create_issue(test)
-            puts "Created new issue: #{issue.web_url}"
-          end
-
-          issue
-        end
-
-        def find_issue(test, issue_type)
-          issues = gitlab.find_issues(options: { search: search_term(test) }) do |issue|
-            issue.state == 'opened' && issue.issue_type == issue_type && issue.title.strip == title_from_test(test)
-          end
-
-          warn(%(Too many #{issue_type}s found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
-
-          issues.first
-        end
-
-        def add_issue_to_testcase(testcase, issue)
-          results_section = testcase.description.include?(RESULTS_SECTION_TEMPLATE) ? '' : RESULTS_SECTION_TEMPLATE
-
-          gitlab.edit_issue(iid: testcase.iid, options: { description: (testcase.description + results_section + "\n\n#{issue.web_url}") })
-
-          puts "Added issue #{issue.web_url} to testcase #{testcase.web_url}"
-        end
-
-        def update_issue(issue, test)
-          new_labels = issue_labels(issue)
-          new_labels |= ['Testcase Linked']
-
-          labels_updated = update_labels(issue, test, new_labels)
-          note_posted = note_status(issue, test)
-
-          if labels_updated || note_posted
-            puts "Issue updated."
-          else
-            puts "Test passed, no update needed."
-          end
-        end
-
-        def new_issue_labels(test)
-          ['Quality', "devops::#{test.stage}", 'status::automated']
-        end
-
-        def up_to_date_labels(test:, issue: nil, new_labels: Set.new)
-          labels = super
-          labels |= new_issue_labels(test).to_set
-          labels.delete_if { |label| label.start_with?("#{pipeline}::") }
-          labels << (test.failures.empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
-        end
-
-        def search_term(test)
-          %("#{partial_file_path(test.file)}" "#{search_safe(test.name)}")
-        end
-
         def note_status(issue, test)
           return false if test.skipped
           return false if test.failures.empty?

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Report
+      # Uses the API to create or update GitLab test cases with the results of tests from RSpec report files.
+      class ResultsInTestCases < ReportAsIssue
+        attr_reader :issue_type, :gitlab
+
+        include ResultsReporterShared
+
+        def initialize(**kwargs)
+          super
+          @issue_type = 'test_case'
+        end
+
+        def find_or_create_testcase(test)
+          find_testcase(test) || create_issue(test)
+        end
+
+        def add_issue_link_to_testcase(testcase, issue, test)
+          results_section = testcase.description.include?(TEST_CASE_RESULTS_SECTION_TEMPLATE) ? '' : TEST_CASE_RESULTS_SECTION_TEMPLATE
+
+          gitlab.edit_issue(iid: testcase.iid, options: { description: (testcase.description + results_section + "\n\n#{issue.web_url}") })
+          # We are using test.testcase for the url here instead of testcase.web_url since it has the updated test case path
+          puts "Added results issue #{issue.web_url} link to test case #{test.testcase}"
+        end
+
+        def update_testcase(testcase, test)
+          puts "Test case labels updated." if update_labels(testcase, test)
+        end
+
+        private
+
+        def find_testcase(test)
+          testcase = find_testcase_by_iid(test)
+
+          if testcase
+            testcase = update_issue_title(testcase, test) if issue_title_needs_updating?(testcase, test)
+          else
+            testcase = find_issue(test)
+          end
+
+          testcase
+        end
+
+        def find_testcase_by_iid(test)
+          iid = testcase_iid_from_url(test.testcase)
+
+          return unless iid
+
+          find_issue_by_iid(iid)
+        end
+
+        def testcase_iid_from_url(url)
+          return warn(%(\nPlease update #{url} to test case url")) if url&.include?('/-/issues/')
+
+          url && url.split('/').last.to_i
+        end
+
+        def new_issue_description(test)
+          "#{super}#{TEST_CASE_RESULTS_SECTION_TEMPLATE}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/enumerable'
+
+module Gitlab
+  module QA
+    module Report
+      module ResultsReporterShared
+        TEST_CASE_RESULTS_SECTION_TEMPLATE = "\n\n### DO NOT EDIT BELOW THIS LINE\n\nActive and historical test results:"
+
+        def find_issue(test)
+          issues = search_for_issues(test)
+
+          warn(%(Too many #{issue_type}s found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
+          puts "Found existing #{issue_type}: #{issues.first.web_url}" unless issues.empty?
+
+          issues.first
+        end
+
+        def find_issue_by_iid(iid)
+          issues = gitlab.find_issues(iid: iid) do |issue|
+            issue.state == 'opened' && issue.issue_type == issue_type
+          end
+
+          warn(%(#{issue_type} iid "#{iid}" not valid)) if issues.empty?
+
+          issues.first
+        end
+
+        def issue_title_needs_updating?(issue, test)
+          issue.title.strip != title_from_test(test) && !%w[canary production preprod release].include?(pipeline)
+        end
+
+        def new_issue_labels(test)
+          ['Quality', "devops::#{test.stage}", 'status::automated']
+        end
+
+        def search_term(test)
+          %("#{partial_file_path(test.file)}" "#{search_safe(test.name)}")
+        end
+
+        def up_to_date_labels(test:, issue: nil, new_labels: Set.new)
+          labels = super
+          labels |= new_issue_labels(test).to_set
+          labels.delete_if { |label| label.start_with?("#{pipeline}::") }
+          labels << (test.failures.empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
+        end
+
+        def update_issue_title(issue, test)
+          warn(%(#{issue_type} title needs to be updated from '#{issue.title.strip}' to '#{title_from_test(test)}'))
+
+          gitlab.edit_issue(iid: issue.iid, options: { title: title_from_test(test) })
+        end
+
+        private
+
+        def search_for_issues(test)
+          gitlab.find_issues(options: { search: search_term(test) }) do |issue|
+            issue.state == 'opened' && issue.issue_type == issue_type && issue.title.strip == title_from_test(test)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/reporter.rb

@@ -17,8 +17,8 @@ module Gitlab
             report_options[:input_files] = files if files
           end
 
-          opts.on('--report-in-issues FILES', String, 'Report test results from JUnit XML files in GitLab issues') do |files|
-            report_options[:report_in_issues] = true
+          opts.on('--report-results FILES', String, 'Report test results from JUnit XML files in GitLab test cases and results issues') do |files|
+            report_options[:report_results] = true
             report_options[:input_files] = files if files
           end
 
@@ -31,16 +31,24 @@ module Gitlab
             report_options[:max_diff_ratio] = value
           end
 
-          opts.on('-p', '--project PROJECT_ID', String, 'A valid project ID. Can be an integer or a group/project string. Required by --report-in-issues and --relate-failure-issue') do |value|
+          opts.on('-p', '--project PROJECT_ID', String, 'A valid project ID. Can be an integer or a group/project string. Required by --relate-failure-issue') do |value|
             report_options[:project] = value
           end
 
+          opts.on('--results-issue-project RESULTS_ISSUE_PROJECT_ID', String, 'A valid project ID. Can be an integer or a group/project string. Required by --report-results') do |value|
+            report_options[:results_issue_project] = value
+          end
+
+          opts.on('--test-case-project TEST_CASE_PROJECT_ID', String, 'A valid project ID. Can be an integer or a group/project string. Required by --report-results') do |value|
+            report_options[:test_case_project] = value
+          end
+
           opts.on('--generate-test-session FILES', String, 'Generate test session report') do |files|
             report_options[:generate_test_session] = true
             report_options[:input_files] = files if files
           end
 
-          opts.on('-t', '--token ACCESS_TOKEN', String, 'A valid access token. Required by --report-in-issues and --relate-failure-issue') do |value|
+          opts.on('-t', '--token ACCESS_TOKEN', String, 'A valid access token. Required by --report-results and --relate-failure-issue') do |value|
             report_options[:token] = value
           end
 
@@ -60,7 +68,7 @@ module Gitlab
             report_options[:files] = files
           end
 
-          opts.on('--dry-run', "Perform a dry-run (don't create or update issues)") do |files|
+          opts.on('--dry-run', "Perform a dry-run (don't create or update issues or test cases)") do |files|
             report_options[:dry_run] = true
           end
 
@@ -86,9 +94,9 @@ module Gitlab
             report_options[:token] = Runtime::TokenFinder.find_token!(report_options[:token])
             Gitlab::QA::Report::RelateFailureIssue.new(**report_options).invoke!
 
-          elsif report_options.delete(:report_in_issues)
+          elsif report_options.delete(:report_results)
             report_options[:token] = Runtime::TokenFinder.find_token!(report_options[:token])
-            Gitlab::QA::Report::ResultsInIssues.new(**report_options).invoke!
+            Gitlab::QA::Report::ReportResults.new(**report_options).invoke!
 
           elsif report_options.delete(:generate_test_session)
             report_options[:token] = Runtime::TokenFinder.find_token!(report_options[:token])

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

@@ -123,7 +123,8 @@ module Gitlab
           'GOOGLE_JSON_KEY' => :google_json_key,
           'GCS_BUCKET_NAME' => :gcs_bucket_name,
           'SMOKE_ONLY' => :smoke_only,
-          'NO_ADMIN' => :no_admin
+          'NO_ADMIN' => :no_admin,
+          'CHROME_DISABLE_DEV_SHM' => :chrome_disable_dev_shm
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|

data/lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class ServicePingDisabled < Scenario::Template
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+
+                gitlab.omnibus_configuration << <<~OMNIBUS
+                  gitlab_rails['usage_ping_enabled'] = false;
+                OMNIBUS
+
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Integration::ServicePingDisabled'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.14.0'.freeze
+    VERSION = '7.16.1'.freeze
   end
 end

data/lib/gitlab/qa.rb

@@ -72,6 +72,7 @@ module Gitlab
           autoload :ClientSSL, 'gitlab/qa/scenario/test/integration/client_ssl'
           autoload :Registry, 'gitlab/qa/scenario/test/integration/registry'
           autoload :RegistryTLS, 'gitlab/qa/scenario/test/integration/registry_tls'
+          autoload :ServicePingDisabled, 'gitlab/qa/scenario/test/integration/service_ping_disabled'
         end
 
         module Sanity
@@ -122,7 +123,10 @@ module Gitlab
       autoload :JUnitTestResults, 'gitlab/qa/report/junit_test_results'
       autoload :PrepareStageReports, 'gitlab/qa/report/prepare_stage_reports'
       autoload :ReportAsIssue, 'gitlab/qa/report/report_as_issue'
+      autoload :ReportResults, 'gitlab/qa/report/report_results'
       autoload :ResultsInIssues, 'gitlab/qa/report/results_in_issues'
+      autoload :ResultsInTestCases, 'gitlab/qa/report/results_in_testcases'
+      autoload :ResultsReporterShared, 'gitlab/qa/report/results_reporter_shared'
       autoload :GenerateTestSession, 'gitlab/qa/report/generate_test_session'
       autoload :SummaryTable, 'gitlab/qa/report/summary_table'
       autoload :TestResult, 'gitlab/qa/report/test_result'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.14.0
+  version: 7.16.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -256,7 +256,10 @@ files:
 - lib/gitlab/qa/report/prepare_stage_reports.rb
 - lib/gitlab/qa/report/relate_failure_issue.rb
 - lib/gitlab/qa/report/report_as_issue.rb
+- lib/gitlab/qa/report/report_results.rb
 - lib/gitlab/qa/report/results_in_issues.rb
+- lib/gitlab/qa/report/results_in_testcases.rb
+- lib/gitlab/qa/report/results_reporter_shared.rb
 - lib/gitlab/qa/report/summary_table.rb
 - lib/gitlab/qa/report/test_result.rb
 - lib/gitlab/qa/report/update_screenshot_path.rb
@@ -309,6 +312,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/registry.rb
 - lib/gitlab/qa/scenario/test/integration/registry_tls.rb
 - lib/gitlab/qa/scenario/test/integration/saml.rb
+- lib/gitlab/qa/scenario/test/integration/service_ping_disabled.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
 - lib/gitlab/qa/scenario/test/integration/ssh_tunnel.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb