gitlab-qa 7.15.1 → 7.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff5b2a5b6b59f95a7ce622eb57a6157dc7492af83be416d3b8950ba527c3495
-  data.tar.gz: 6da73f8680896f2875e4899ea21b3272c418ee0140ae9d1a54b5117e870f5e5a
+  metadata.gz: ff50dfd062e99694daf1ff16ba5a2dc90009e115ae7135daefad599d10cf71d3
+  data.tar.gz: 65d3e0b16cfb76564db771428aa8ed8a308ef2cabb4573cefe39f418c81dfce2
 SHA512:
-  metadata.gz: 6110c4e993d4ff262476a637e7fad86a32561c29609bd6a5341cf8d14a53de73a0c7301763a71a3674551cd36385d67ed42db86de2c434cd938c13cbb98a0afa
-  data.tar.gz: 43db85b7549e3b3296df9f1d2c8534724d7c908ecaa11b300fe64f8a7b0f4297fbf88e704c8431fa2da4ce5a5247788136a6b66972cbbf7fd6dd1a6de3956dff
+  metadata.gz: 7270725434c4cdf1fa7b0630635087b8a9d4871929f705a97980b206a3a9cbe44c874974ae0fef215eb2521fa28c8f7bae866ec2e39ac13d16db95750bf82cb3
+  data.tar.gz: 7eb6bff95f128d1cf7a8ca99210cb8066a49871d4e676c22053e37e4137229a6d58e70c944267ee7a51ada4a803c3d00adbbc2c4b5c8083bbc3c79a068725795

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"
@@ -84,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
@@ -107,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:
@@ -1332,7 +1333,7 @@ generate-allure-report:
   cache:
     policy: pull
   before_script:
-    - echo "Generating and publishing allure test report"
+    - export ALLURE_JOB_NAME="${ALLURE_JOB_NAME:-package-and-qa}"
   rules:
     # Don't run report generation on release pipelines
     - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
@@ -1345,8 +1346,6 @@ generate-allure-report:
         ALLURE_JOB_NAME: gitlab-qa
       when: always
     - if: '$TOP_UPSTREAM_SOURCE_PROJECT && $TOP_UPSTREAM_SOURCE_SHA'
-      variables:
-        ALLURE_JOB_NAME: package-and-qa
       when: always
 
 include:

data/docs/what_tests_can_be_run.md

@@ -703,6 +703,9 @@ in the GitLab project).
 
 **Required environment variables:**
 
+- `GITLAB_QA_USER_AGENT`: The browser user-agent to use instead of the default Chrome user-agent.
+  This is needed for the automated tests to bypass the WAF
+
 - `GITLAB_QA_ACCESS_TOKEN`: A valid personal access token with the `api` scope.
   This is used to retrieve the version that staging is currently running.
   This can be found in the shared 1Password vault.
@@ -718,6 +721,7 @@ in the GitLab project).
 Example:
 
 ```
+$ export GITLAB_QA_USER_AGENT="$GITLAB_QA_USER_AGENT"
 $ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
 $ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
 $ export GITLAB_USERNAME="gitlab-qa"

data/gitlab-qa.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'solargraph', '~> 0.41'
   spec.add_development_dependency 'webmock', '3.7.0'
   spec.add_runtime_dependency 'activesupport', '~> 6.1'
-  spec.add_runtime_dependency 'gitlab', '~> 4.16.1'
+  spec.add_runtime_dependency 'gitlab', '~> 4.18.0'
   spec.add_runtime_dependency 'http', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
   spec.add_runtime_dependency 'table_print', '1.5.7'

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

@@ -8,7 +8,7 @@ module Gitlab
       # the `qa/` directory located in GitLab CE / EE repositories.
       #
       class Specs < Scenario::Template
-        attr_accessor :suite, :release, :network, :args, :volumes, :env, :runner_network
+        attr_accessor :suite, :release, :network, :args, :volumes, :env, :runner_network, :hostname
 
         def initialize
           @docker = Docker::Engine.new
@@ -45,6 +45,11 @@ module Gitlab
             @docker.run(image: qa_image, args: [suite, *args_with_flags(args, feature_flag_set)]) do |command|
               command << "-t --rm --net=#{network || 'bridge'}"
 
+              unless hostname.nil?
+                command << "--hostname #{hostname}"
+                command.env('QA_HOSTNAME', hostname)
+              end
+
               env.merge(Runtime::Env.variables).each do |key, value|
                 command.env(key, value)
               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,60 @@
+# 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
+        attr_accessor :testcase_project_reporter, :results_issue_project_reporter, :files, :test_case_project, :results_issue_project, :gitlab
+
+        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)
+          @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)
+          testcase = 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)
+
+          testcase_project_reporter.add_issue_link_to_testcase(testcase, issue, test) if is_new
+
+          testcase_project_reporter.update_testcase(testcase, test)
+          results_issue_project_reporter.update_issue(issue, test)
+        end
+      end
+    end
+  end
+end

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

@@ -1,124 +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_needs_updating?(issue, 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']
+
+          labels_updated = update_labels(issue, test, new_labels)
+          note_posted = note_status(issue, test)
 
-          if testcase
-            testcase = update_issue_title(testcase, test, 'test_case') if issue_title_needs_updating?(testcase, 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
-
-        def issue_title_needs_updating?(issue, test)
-          issue.title.strip != title_from_test(test) && !%w[canary production preprod release].include?(pipeline)
-        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')
+          find_issue_by_iid(iid)
         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
-        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
 
@@ -127,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/scenario/test/instance/image.rb

@@ -19,6 +19,7 @@ module Gitlab
                 gitlab.instance do
                   Component::Specs.perform do |specs|
                     specs.suite = 'Test::Instance::All'
+                    specs.hostname = "qa-e2e-specs.#{gitlab.network}"
                     specs.release = gitlab.release
                     specs.network = gitlab.network
                     specs.args = [gitlab.address, *rspec_args]

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
-    VERSION = '7.15.1'.freeze
+    VERSION = '7.17.1'
   end
 end

data/lib/gitlab/qa.rb

@@ -123,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.15.1
+  version: 7.17.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.16.1
+        version: 4.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.16.1
+        version: 4.18.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -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