gitlab-qa 7.7.1 → 7.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ca7555b9f98741e143d9fc7e4a0b2cf222dc6f09358f39d23a793ff0e68afa
-  data.tar.gz: 1a114120fb17750c0e3a1ecdb64e0e04a1aba706df0677ae245887e2a67558cb
+  metadata.gz: 3d5db8c8b0acf394172a0def237d3049c42c04a811204589d6052fb3fda32eb2
+  data.tar.gz: ae97cccc20dce22ce593a1d5a9690d6375b68fcd8ca1d2c4f854803c92dc17d2
 SHA512:
-  metadata.gz: '04937666da2a6ebbdc99a5f4f121eff130dbf1540447a51691736243c93e1eb3ce5bbd63f17ede7d293fe77789f6f72bf5c9ab2ca556217d4c34821f40ba4ac0'
-  data.tar.gz: 6dac435397a5de6d3aba5596dc7b3faa0eba15076f957d6d268d5be88547e670ee97db24f00b58d33fc48547d9eda4c0eb0769fada06f2837cebdd947573c00c
+  metadata.gz: 9f13f3e88a045994996a2664e0efedc7dadac3ac53e7cd52b0338cf95b33224bd28d92dbe1909dd0ba66f60b4de1b41dd407c1fd1604b72b295c9368a8526710
+  data.tar.gz: aed74598a8cb77c86822ceb2dc457641e4092aa764dba0bbcb3cd281d4a85abe329a8ecda6670e325655afd0470730b9e7699f5be5b0517dec66866f7adcca04

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

@@ -196,7 +196,7 @@ module Gitlab
           if testcase && !passed
             # Workaround for reducing system notes on testcase issues
             # The first regex extracts the link to the issues list page from a link to a single issue show page by removing the issue id.
-            "[#{text}](#{testcase.match(%r{[\s\S]+\/[^\/\d]+})}?state=opened&search=#{encoded_text}) (testcase_id=#{testcase.match(/\d+/)})"
+            "[#{text}](#{testcase.match(%r{[\s\S]+\/[^\/\d]+})}?state=opened&search=#{encoded_text})"
           else
             text
           end

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

@@ -49,7 +49,7 @@ module Gitlab
           select ||= :itself
 
           handle_gitlab_client_exceptions do
-            return [Gitlab.issue(project, iid)] if iid
+            return [Gitlab.issue(project, iid)].select(&select) if iid
 
             Gitlab.issues(project, options)
               .auto_paginate
@@ -63,8 +63,8 @@ module Gitlab
           end
         end
 
-        def create_issue(title:, description:, labels:)
-          attrs = { description: description, labels: labels }
+        def create_issue(title:, description:, labels:, issue_type: 'issue')
+          attrs = { issue_type: issue_type, description: description, labels: labels }
 
           handle_gitlab_client_exceptions do
             Gitlab.create_issue(project, title, attrs)

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

@@ -4,10 +4,10 @@ module Gitlab
   module QA
     module Report
       class GitlabIssueDryClient < GitlabIssueClient
-        def create_issue(title:, description:, labels:)
+        def create_issue(title:, description:, labels:, issue_type: 'issue')
           attrs = { description: description, labels: labels }
 
-          puts "The following issue would have been created:"
+          puts "The following #{issue_type} would have been created:"
           puts "project: #{project}, title: #{title}, attrs: #{attrs}"
         end
 

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

@@ -150,10 +150,10 @@ module Gitlab
         end
 
         def new_issue_labels(test)
-          NEW_ISSUE_LABELS + up_to_date_labels(test: test)
+          up_to_date_labels(test: test, new_labels: NEW_ISSUE_LABELS)
         end
 
-        def up_to_date_labels(test:, issue: nil)
+        def up_to_date_labels(test:, issue: nil, new_labels: Set.new)
           super << pipeline_name_label
         end
 

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

@@ -88,17 +88,18 @@ module Gitlab
           issue&.labels&.to_set || Set.new
         end
 
-        def update_labels(issue, test)
-          new_labels = up_to_date_labels(test: test, issue: issue)
+        def update_labels(issue, test, new_labels = Set.new)
+          labels = up_to_date_labels(test: test, issue: issue, new_labels: new_labels)
 
-          return if issue_labels(issue) == new_labels
+          return if issue_labels(issue) == labels
 
-          gitlab.edit_issue(iid: issue.iid, options: { labels: new_labels.to_a })
+          gitlab.edit_issue(iid: issue.iid, options: { labels: labels.to_a })
         end
 
-        def up_to_date_labels(test:, issue: nil)
+        def up_to_date_labels(test:, issue: nil, new_labels: Set.new)
           labels = issue_labels(issue)
-          labels << "Enterprise Edition" if ee_test?(test)
+          labels |= new_labels
+          ee_test?(test) ? labels << "Enterprise Edition" : labels.delete("Enterprise Edition")
           quarantine_job? ? labels << "quarantine" : labels.delete("quarantine")
 
           labels

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

@@ -10,6 +10,8 @@ module Gitlab
       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}`."
 
@@ -17,7 +19,7 @@ module Gitlab
             puts "Reporting tests in #{test_results.path}"
 
             test_results.each do |test|
-              report_test(test)
+              report_test(test) unless test.skipped
             end
 
             test_results.write
@@ -27,56 +29,138 @@ module Gitlab
         def report_test(test)
           puts "Reporting test: #{test.file} | #{test.name}"
 
-          issue = find_issue(test)
+          testcase = find_testcase(test) || create_testcase(test)
+          test.testcase ||= testcase.web_url.sub('/issues/', '/quality/test_cases/')
+
+          issue = find_issue_by_iid(testcase, test)
+
+          unless issue
+            puts "No valid issue link found"
+            issue = find_or_create_issue(test)
+
+            add_issue_to_testcase(testcase, issue)
+            puts "Added issue #{issue.web_url} to testcase #{testcase.web_url}"
+          end
+
+          update_labels(testcase, test)
+          update_issue(issue, test)
+        end
+
+        def find_testcase(test)
+          iid = iid_from_testcase_url(test.testcase)
+
+          testcases = search_issues(test: test, issue_type: 'test_case', iid: iid)
+
+          if iid && testcases.blank?
+            warn(%(Test case url "#{test.testcase}" not valid))
+            testcases = search_issues(test: test, issue_type: 'test_case')
+          end
+
+          warn(%(Too many test cases found with the file path "#{test.file}" and name "#{test.name}")) if testcases&.many?
+
+          testcases.first
+        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 iid_from_testcase_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}"
+        end
+
+        def issue_iid_from_testcase(testcase)
+          results = testcase.description.partition(RESULTS_SECTION_TEMPLATE).last if testcase.description.include?(RESULTS_SECTION_TEMPLATE)
+
+          return puts "No issue link found" unless results
+
+          issue_iid = results.split('/').last
+
+          issue_iid&.to_i
+        end
+
+        def find_or_create_issue(test)
+          issue = find_issue(test, 'issue')
 
           if issue
             puts "Found existing issue: #{issue.web_url}"
           else
-            # Don't create new issues for skipped tests
-            return if test.skipped
-
             issue = create_issue(test)
             puts "Created new issue: #{issue.web_url}"
           end
 
-          test.testcase ||= issue.web_url
+          issue
+        end
 
-          labels_updated = update_labels(issue, test)
-          note_posted = note_status(issue, test)
+        def find_issue_by_iid(testcase, test)
+          iid = issue_iid_from_testcase(testcase)
 
-          if labels_updated || note_posted
-            puts "Issue updated."
-          else
-            puts "Test passed, no update needed."
-          end
+          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)
-          title = title_from_test(test)
-          issues =
-            gitlab.find_issues(
-              iid: iid_from_testcase_url(test.testcase),
-              options: { search: search_term(test) }) do |issue|
-                issue.state == 'opened' && issue.title.strip == title
-              end
+        def find_issue(test, issue_type)
+          issues = search_issues(test: test, issue_type: 'issue')
 
           warn(%(Too many issues 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}") })
+        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)
-          %w[status::automated]
+          ['Quality', "devops::#{test.stage}", 'status::automated']
         end
 
-        def up_to_date_labels(test:, issue: nil)
+        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 iid_from_testcase_url(url)
-          url && url.split('/').last.to_i
+        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)

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

@@ -107,9 +107,8 @@ module Gitlab
                 praefect['database_password'] = 'SQL_PASSWORD';
                 praefect['database_dbname'] = 'praefect_production';
                 praefect['database_sslmode'] = 'disable';
-                praefect['database_host_no_proxy'] = '#{@database}.#{@network}';
-                praefect['database_port_no_proxy'] = 5432;
-                praefect['failover_election_strategy'] = 'per_repository';
+                praefect['database_direct_host'] = '#{@database}.#{@network}';
+                praefect['database_direct_port'] = 5432;
                 praefect['virtual_storages'] = {
                   'default' => {
                     'nodes' => {

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.7.1'.freeze
+    VERSION = '7.8.1'.freeze
   end
 end

metadata

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