gitlab-qa 7.8.3 → 7.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c415d54da820d67fa1544a1ffaefaf913f27090c6c07fa1f06c02797bd8756d3
-  data.tar.gz: 43ad1f640c478c666658e503fa84b77e9a3bcfaa5c69d7d5d2ae4151e34c7adc
+  metadata.gz: c8e6f385001950cb2511426d82a6acac3c3615683b8dbd48214df976c6fb07d5
+  data.tar.gz: 51de85c6c9c5dca24ba24961d45005d9ff2bbe168d7a8819f54ee6412ab0abcd
 SHA512:
-  metadata.gz: bce89411537a6398b5168ecd32bbea3e8996173e07ef16bd4142c70e3c9cdf14110fe7d1b9dd35feaae37809068e255ced355d804c331a0f43431b47de92f787
-  data.tar.gz: 6c159684288d094f6266ea427f6320611b724f823f8ebab216a5139817c047fc1c99602b742a51d9467b38348f89d628b2995ea81ad722ed2229d6d089d0952a
+  metadata.gz: e4ee08298871f1dff0ce9e0c007ac1c7e6d643fd13161f38beac5a59574a43931abf87a904488ba1b9e6037d451b22ad151b10afed9df41ed68bf39b1500e18e
+  data.tar.gz: 266d10c931d8762dcfb34e9aa07f44a38dd1656cccbdd38a7e559ce04d8fec2144f5156f8b8cc4a372db9420a064940861e17146e78d77c0966cbd497e5a4001

data/.gitlab-ci.yml

@@ -158,6 +158,7 @@ rspec:
 ce:sanity-framework:
   variables:
     QA_GENERATE_ALLURE_REPORT: "false"
+    QA_EXPORT_TEST_METRICS: "false"
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:
@@ -168,6 +169,7 @@ ce:sanity-framework:
 ee:sanity-framework:
   variables:
     QA_GENERATE_ALLURE_REPORT: "false"
+    QA_EXPORT_TEST_METRICS: "false"
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:

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

@@ -19,6 +19,8 @@ module Gitlab
             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
 
@@ -27,19 +29,18 @@ module Gitlab
         end
 
         def report_test(test)
-          puts "Reporting test: #{test.file} | #{test.name}"
-
           testcase = find_testcase(test) || create_testcase(test)
           test.testcase ||= testcase.web_url.sub('/issues/', '/quality/test_cases/')
 
-          issue = find_issue_by_iid(testcase, test)
+          issue = find_linked_results_issue_by_iid(testcase, test)
 
-          unless issue
+          if issue
+            issue = update_issue_title(issue, test, 'issue') if issue.title.strip != title_from_test(test)
+          else
             puts "No valid issue link found"
-            issue = find_or_create_issue(test)
+            issue = find_or_create_results_issue(test)
 
             add_issue_to_testcase(testcase, issue)
-            puts "Added issue #{issue.web_url} to testcase #{testcase.web_url}"
           end
 
           update_labels(testcase, test)
@@ -47,18 +48,47 @@ module Gitlab
         end
 
         def find_testcase(test)
-          iid = iid_from_testcase_url(test.testcase)
+          testcase = find_testcase_by_iid(test)
+
+          if testcase
+            testcase = update_issue_title(testcase, test, 'test_case') if testcase.title.strip != title_from_test(test)
+          else
+            testcase = find_issue(test, 'test_case')
+          end
+
+          testcase
+        end
+
+        def find_testcase_by_iid(test)
+          iid = testcase_iid_from_url(test.testcase)
 
-          testcases = search_issues(test: test, issue_type: 'test_case', iid: iid)
+          return unless iid
+
+          find_issue_by_iid(iid, 'test_case')
+        end
+
+        def find_linked_results_issue_by_iid(testcase, test)
+          iid = issue_iid_from_testcase(testcase)
 
-          if iid && testcases.blank?
-            warn(%(Test case url "#{test.testcase}" not valid))
-            testcases = search_issues(test: test, issue_type: 'test_case')
+          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(%(Too many test cases found with the file path "#{test.file}" and name "#{test.name}")) if testcases&.many?
+          warn(%(#{issue_type} iid "#{iid}" not valid)) if issues.empty?
 
-          testcases.first
+          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)
@@ -73,7 +103,7 @@ module Gitlab
           )
         end
 
-        def iid_from_testcase_url(url)
+        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
@@ -93,7 +123,7 @@ module Gitlab
           issue_iid&.to_i
         end
 
-        def find_or_create_issue(test)
+        def find_or_create_results_issue(test)
           issue = find_issue(test, 'issue')
 
           if issue
@@ -106,22 +136,12 @@ module Gitlab
           issue
         end
 
-        def find_issue_by_iid(testcase, test)
-          iid = issue_iid_from_testcase(testcase)
-
-          return unless iid
-
-          issues = search_issues(test: test, issue_type: 'issue', iid: iid)
-
-          warn(%(Issue iid "#{iid}" not valid)) if issues.empty?
-
-          issues.first
-        end
-
         def find_issue(test, issue_type)
-          issues = search_issues(test: test, issue_type: 'issue')
+          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 issues found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
+          warn(%(Too many #{issue_type}s found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
 
           issues.first
         end
@@ -130,6 +150,8 @@ module Gitlab
           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)
@@ -157,12 +179,6 @@ module Gitlab
           labels << (test.failures.empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
         end
 
-        def search_issues(test:, issue_type:, iid: nil)
-          gitlab.find_issues(iid: iid, options: { search: search_term(test) }) do |issue|
-            issue.state == 'opened' && issue.issue_type == issue_type && issue.title.strip == title_from_test(test)
-          end
-        end
-
         def search_term(test)
           %("#{partial_file_path(test.file)}" "#{search_safe(test.name)}")
         end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.8.3'.freeze
+    VERSION = '7.8.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.8.3
+  version: 7.8.4
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control