gitlab_quality-test_tooling 1.34.0 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3f45e3af6f11c3ebca5f44f3d717960c1ac20cffdc13db75a16d68c9eecfbd
-  data.tar.gz: 0edf629fc7f432a779141be67a231887224a78793defedad416df50b327ecbcb
+  metadata.gz: 25fe4fd0cb49b8e51816f2da8c88e0722e81c4bd1b71e6ba3f980a8a1ca0e255
+  data.tar.gz: 679100eddc3bcce725465a9e4c71808fde8917c9014d149639081c22daf95e03
 SHA512:
-  metadata.gz: 7570cde0cd99ea0fe3148f9a8c1f9a7035c165fb0f5506623a79d3f2c3227581d6de878fd56c9a5d5f4c4bae22191d688f49355c74e4b4926b6362ef5d3f8d06
-  data.tar.gz: 0112df035902806c60a82433118669b43bcd9feff89fd8dc7061ee6ffcda9c53ead791c7df4c188567b2b16ee3be8880e269088f4bee944b944aa2dafb60bfef
+  metadata.gz: db8f81ef6632edf827cce50997a2318f5d82c17a1714b3bf4cf6e0407aca5ad47bc34de92a49b3d45c3ad764a585085ff93baa1ce3da5da286dc5015ad61e113
+  data.tar.gz: 157ac822424ad6cf581ac9cd1993071474e5238d61b44f093080358f1829f95505488d9382819173c632e27f3cc9fff5bd8c3aee3efae51b84bc87ef0373b70d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (1.34.0)
+    gitlab_quality-test_tooling (1.36.0)
       activesupport (>= 7.0, < 7.2)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)

data/lib/gitlab_quality/test_tooling/gitlab_client/gitlab_client.rb

@@ -44,11 +44,11 @@ module GitlabQuality
           pipeline = Runtime::Env.pipeline_from_project_name
           channel = case pipeline
                     when "canary"
-                      "qa-production"
-                    when "staging-canary"
-                      "qa-staging"
+                      "e2e-run-production"
+                    when "staging", "staging-canary"
+                      "e2e-run-staging"
                     else
-                      "qa-#{pipeline}"
+                      "e2e-run-#{pipeline}"
                     end
 
           slack_options = {

data/lib/gitlab_quality/test_tooling/report/health_problem_reporter.rb

@@ -20,6 +20,18 @@ module GitlabQuality
         FOUND_IN_MR_LABEL     = '~"found:in MR"'
         FOUND_IN_MASTER_LABEL = '~"found:master"'
 
+        def initialize(input_files: [], **kwargs)
+          super(input_files: input_files, **kwargs)
+        end
+
+        def most_recent_report_date_for_issue(issue_iid:)
+          if report_in_discussion?
+            most_recent_report_from_discussion(issue_iid: issue_iid)
+          else
+            most_recent_report_from_note(issue_iid: issue_iid)
+          end
+        end
+
         private
 
         def problem_type
@@ -62,6 +74,28 @@ module GitlabQuality
           found_label
         end
 
+        def most_recent_report_from_discussion(issue_iid:)
+          reports_discussion = existing_reports_discussion(issue_iid: issue_iid)
+          return unless reports_discussion
+
+          # We're skipping the first note of the discussion as this is the "non-collapsible note", aka
+          # the "header note", which doesn't contain any stack trace.
+          reports_discussion.notes[1..].filter_map do |reports_note|
+            most_recent_report_from_reports_note(reports_note)&.report_date
+          end.max
+        end
+
+        def most_recent_report_from_note(issue_iid:)
+          reports_note = existing_reports_note(issue_iid: issue_iid)
+          return unless reports_note
+
+          most_recent_report_from_reports_note(reports_note)&.report_date
+        end
+
+        def most_recent_report_from_reports_note(reports_note)
+          @most_recent_report_from_reports_note ||= report_lines(reports_note&.body.to_s).first
+        end
+
         def run!
           puts "Reporting tests in `#{files.join(',')}` as issues in project `#{project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
 
@@ -102,11 +136,11 @@ module GitlabQuality
         def add_report_to_issue(issue:, test:, related_issues:) # rubocop:disable Metrics/AbcSize -- FIXME
           current_reports_note =
             if report_in_discussion?
-              reports_discussion = find_or_create_reports_discussion(issue: issue)
+              reports_discussion = find_or_create_reports_discussion(issue_iid: issue.iid)
 
               find_failure_discussion_note(issue: issue, test: test, reports_discussion: reports_discussion)
             else
-              existing_reports_note(issue: issue)
+              existing_reports_note(issue_iid: issue.iid)
             end
 
           new_reports_list = add_report_for_test(current_reports_content: current_reports_note&.body.to_s, test: test)
@@ -135,15 +169,15 @@ module GitlabQuality
           end
         end
 
-        def find_or_create_reports_discussion(issue:)
-          reports_discussion = existing_reports_discussion(issue: issue)
+        def find_or_create_reports_discussion(issue_iid:)
+          reports_discussion = existing_reports_discussion(issue_iid: issue_iid)
           return reports_discussion if reports_discussion
 
-          gitlab.create_issue_discussion(iid: issue.iid, note: report_section_header)
+          gitlab.create_issue_discussion(iid: issue_iid, note: report_section_header)
         end
 
-        def existing_reports_discussion(issue:)
-          gitlab.find_issue_discussions(iid: issue.iid).find do |discussion|
+        def existing_reports_discussion(issue_iid:)
+          gitlab.find_issue_discussions(iid: issue_iid).find do |discussion|
             next if discussion.individual_note
             next unless discussion.notes.first
 
@@ -151,8 +185,8 @@ module GitlabQuality
           end
         end
 
-        def existing_reports_note(issue:)
-          gitlab.find_issue_notes(iid: issue.iid).find do |note|
+        def existing_reports_note(issue_iid:)
+          gitlab.find_issue_notes(iid: issue_iid).find do |note|
             note.body.start_with?(report_section_header)
           end
         end

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "1.34.0"
+    VERSION = "1.36.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 1.34.0
+  version: 1.36.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control