Pass build.group_name as testsuite name

3 files changed, 8 insertions, 8 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 8a7029fecd7..e370feed749 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -67,7 +67,7 @@ module Ci
       where('NOT EXISTS (?)', Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id').trace)
     end
 
-    scope :with_junit_artifacts, ->() do
+    scope :with_test_reports, ->() do
       where('EXISTS (?)', Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id').junit)
     end
 
@@ -612,7 +612,7 @@ module Ci
     def collect_test_results(test_results)
       job_artifacts_junit.open do |stream|
         Gitlab::Ci::Build::Artifacts::GzipFileAdapter.new(stream).each_blob do |blob, name|
-          Gitlab::Ci::Build::Artifacts::JunitParser.new(blob).parse!(test_results)
+          Gitlab::Ci::Build::Artifacts::JunitParser.new(blob, group_name).parse!(test_results)
         end
       end
     end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 671b812cbdf..228922ec27d 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -488,7 +488,7 @@ module Ci
         @ci_yaml_file
       else
         self.yaml_errors = "Failed to load CI/CD config file for #{sha}"
-        nil
+        nil 
       end
     end
 
@@ -605,7 +605,7 @@ module Ci
 
     def test_results
       Gitlab::Ci::Build::Artifacts::TestResults.new.tap do |test_results|
-        builds.with_junit_artifacts.each do |build|
+        builds.with_test_reports.each do |build|
           build.collect_test_results(test_results)
         end
       end
diff --git a/lib/gitlab/ci/build/artifacts/junit_parser.rb b/lib/gitlab/ci/build/artifacts/junit_parser.rb
index bc760fc1bea..0aac05fd4eb 100644
--- a/lib/gitlab/ci/build/artifacts/junit_parser.rb
+++ b/lib/gitlab/ci/build/artifacts/junit_parser.rb
@@ -3,10 +3,11 @@ module Gitlab
     module Build
       module Artifacts
         class JunitParser
-          attr_reader :data
+          attr_reader :data, :group_name
 
-          def initialize(xml_data)
+          def initialize(xml_data, group_name)
             @data = Hash.from_xml(xml_data)
+            @group_name = group_name
           end
 
           def parse!(test_results)
@@ -17,7 +18,7 @@ module Gitlab
                 test_results.add_summary(summary)
 
                 parse_testcases(testsuite_name, testcases) do |testcase|
-                  test_results.add_result(testcase)
+                  test_results.add_result(testsuite_name: group_name, **testcase)
                 end
               end
             end
@@ -65,4 +66,3 @@ module Gitlab
     end
   end
 end
-