Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 2 deletions

diff --git a/app/services/ci/build_report_result_service.rb b/app/services/ci/build_report_result_service.rb
new file mode 100644
index 00000000000..758ba1c73bf
--- /dev/null
+++ b/app/services/ci/build_report_result_service.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Ci
+  class BuildReportResultService
+    def execute(build)
+      return unless Feature.enabled?(:build_report_summary, build.project)
+      return unless build.has_test_reports?
+
+      build.report_results.create!(
+        project_id: build.project_id,
+        data: tests_params(build)
+      )
+    end
+
+    private
+
+    def generate_test_suite_report(build)
+      build.collect_test_reports!(Gitlab::Ci::Reports::TestReports.new)
+    end
+
+    def tests_params(build)
+      test_suite = generate_test_suite_report(build)
+
+      {
+        tests: {
+          name: test_suite.name,
+          duration: test_suite.total_time,
+          failed: test_suite.failed_count,
+          errored: test_suite.error_count,
+          skipped: test_suite.skipped_count,
+          success: test_suite.success_count
+        }
+      }
+    end
+  end
+end
diff --git a/app/services/concerns/measurable.rb b/app/services/concerns/measurable.rb
index 5a74f15506e..b099a58a9ae 100644
--- a/app/services/concerns/measurable.rb
+++ b/app/services/concerns/measurable.rb
@@ -4,8 +4,6 @@
 # Example:
 # ```
 #   class DummyService
-#     prepend Measurable
-#
 #     def execute
 #       # ...
 #     end