Add latest changes from gitlab-org/gitlab@master

5 files changed, 3 insertions, 76 deletions

diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 8c26cb02d4b..485d8eee000 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -1084,15 +1084,6 @@
   :idempotent:
   :tags:
   - :requires_disk_io
-- :name: pipeline_background:ci_build_report_result
-  :feature_category: :continuous_integration
-  :has_external_dependencies:
-  :urgency: :low
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: true
-  :tags:
-  - :requires_disk_io
 - :name: pipeline_background:ci_build_trace_chunk_flush
   :feature_category: :continuous_integration
   :has_external_dependencies:
@@ -1181,24 +1172,6 @@
   :weight: 4
   :idempotent:
   :tags: []
-- :name: pipeline_default:build_coverage
-  :feature_category: :continuous_integration
-  :has_external_dependencies:
-  :urgency: :low
-  :resource_boundary: :unknown
-  :weight: 3
-  :idempotent:
-  :tags:
-  - :requires_disk_io
-- :name: pipeline_default:build_trace_sections
-  :feature_category: :continuous_integration
-  :has_external_dependencies:
-  :urgency: :low
-  :resource_boundary: :unknown
-  :weight: 3
-  :idempotent:
-  :tags:
-  - :requires_disk_io
 - :name: pipeline_default:ci_create_cross_project_pipeline
   :feature_category: :continuous_integration
   :has_external_dependencies:
diff --git a/app/workers/build_coverage_worker.rb b/app/workers/build_coverage_worker.rb
deleted file mode 100644
index d63d8549f09..00000000000
--- a/app/workers/build_coverage_worker.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-class BuildCoverageWorker # rubocop:disable Scalability/IdempotentWorker
-  include ApplicationWorker
-  include PipelineQueue
-
-  tags :requires_disk_io
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def perform(build_id)
-    Ci::Build.find_by(id: build_id)&.update_coverage
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-end
diff --git a/app/workers/build_finished_worker.rb b/app/workers/build_finished_worker.rb
index d7a5fcf4f18..4d15bcd16f7 100644
--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
@@ -29,9 +29,9 @@ class BuildFinishedWorker # rubocop:disable Scalability/IdempotentWorker
   # @param [Ci::Build] build The build to process.
   def process_build(build)
     # We execute these in sync to reduce IO.
-    BuildTraceSectionsWorker.new.perform(build.id)
-    BuildCoverageWorker.new.perform(build.id)
-    Ci::BuildReportResultWorker.new.perform(build.id)
+    build.parse_trace_sections!
+    build.update_coverage
+    Ci::BuildReportResultService.new.execute(build)
 
     # We execute these async as these are independent operations.
     BuildHooksWorker.perform_async(build.id)
diff --git a/app/workers/build_trace_sections_worker.rb b/app/workers/build_trace_sections_worker.rb
deleted file mode 100644
index 59f019b827e..00000000000
--- a/app/workers/build_trace_sections_worker.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-class BuildTraceSectionsWorker # rubocop:disable Scalability/IdempotentWorker
-  include ApplicationWorker
-  include PipelineQueue
-
-  tags :requires_disk_io
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def perform(build_id)
-    Ci::Build.find_by(id: build_id)&.parse_trace_sections!
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-end
diff --git a/app/workers/ci/build_report_result_worker.rb b/app/workers/ci/build_report_result_worker.rb
deleted file mode 100644
index 01a45490541..00000000000
--- a/app/workers/ci/build_report_result_worker.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Ci
-  class BuildReportResultWorker
-    include ApplicationWorker
-    include PipelineBackgroundQueue
-
-    tags :requires_disk_io
-
-    idempotent!
-
-    def perform(build_id)
-      Ci::Build.find_by_id(build_id).try do |build|
-        Ci::BuildReportResultService.new.execute(build)
-      end
-    end
-  end
-end