Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 16 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index d9e8873ffc1..1228dfd87d6 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -996,15 +996,11 @@ module Ci
     end
 
     def collect_test_reports!(test_reports)
-      test_reports.get_suite(test_suite_name).tap do |test_suite|
-        each_report(Ci::JobArtifact.file_types_for_report(:test)) do |file_type, blob|
-          Gitlab::Ci::Parsers.fabricate!(file_type).parse!(
-            blob,
-            test_suite,
-            job: self
-          )
-        end
+      each_report(Ci::JobArtifact.file_types_for_report(:test)) do |file_type, blob|
+        Gitlab::Ci::Parsers.fabricate!(file_type).parse!(blob, test_reports, job: self)
       end
+
+      test_reports
     end
 
     def collect_accessibility_reports!(accessibility_report)
@@ -1181,6 +1177,14 @@ module Ci
       job_artifacts.map(&:file_type)
     end
 
+    def test_suite_name
+      if matrix_build?
+        name
+      else
+        group_name
+      end
+    end
+
     protected
 
     def run_status_commit_hooks!
@@ -1191,14 +1195,6 @@ module Ci
 
     private
 
-    def test_suite_name
-      if matrix_build?
-        name
-      else
-        group_name
-      end
-    end
-
     def matrix_build?
       options.dig(:parallel, :matrix).present?
     end