Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

21 files changed, 85 insertions, 2 deletions

diff --git a/app/workers/ci/archive_traces_cron_worker.rb b/app/workers/ci/archive_traces_cron_worker.rb
index 0171c1d482d..c748bc33ada 100644
--- a/app/workers/ci/archive_traces_cron_worker.rb
+++ b/app/workers/ci/archive_traces_cron_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class ArchiveTracesCronWorker # rubocop:disable Scalability/IdempotentWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
 
     feature_category :continuous_integration
diff --git a/app/workers/ci/build_prepare_worker.rb b/app/workers/ci/build_prepare_worker.rb
index 7f640633070..f30e9d3b885 100644
--- a/app/workers/ci/build_prepare_worker.rb
+++ b/app/workers/ci/build_prepare_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class BuildPrepareWorker # rubocop:disable Scalability/IdempotentWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineQueue
 
     queue_namespace :pipeline_processing
diff --git a/app/workers/ci/build_schedule_worker.rb b/app/workers/ci/build_schedule_worker.rb
index 9231b40978d..570f5f28c3d 100644
--- a/app/workers/ci/build_schedule_worker.rb
+++ b/app/workers/ci/build_schedule_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class BuildScheduleWorker # rubocop:disable Scalability/IdempotentWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineQueue
 
     queue_namespace :pipeline_processing
diff --git a/app/workers/ci/build_trace_chunk_flush_worker.rb b/app/workers/ci/build_trace_chunk_flush_worker.rb
index a63b12c0d03..1e0da73e08d 100644
--- a/app/workers/ci/build_trace_chunk_flush_worker.rb
+++ b/app/workers/ci/build_trace_chunk_flush_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class BuildTraceChunkFlushWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineBackgroundQueue
 
     deduplicate :until_executed
diff --git a/app/workers/ci/create_cross_project_pipeline_worker.rb b/app/workers/ci/create_cross_project_pipeline_worker.rb
index 679574d9f60..4881ee12e5c 100644
--- a/app/workers/ci/create_cross_project_pipeline_worker.rb
+++ b/app/workers/ci/create_cross_project_pipeline_worker.rb
@@ -5,6 +5,7 @@ module Ci
     include ::ApplicationWorker
     include ::PipelineQueue
 
+    sidekiq_options retry: 3
     worker_resource_boundary :cpu
 
     def perform(bridge_id)
diff --git a/app/workers/ci/daily_build_group_report_results_worker.rb b/app/workers/ci/daily_build_group_report_results_worker.rb
index 687cadc6366..b38bef3bcf8 100644
--- a/app/workers/ci/daily_build_group_report_results_worker.rb
+++ b/app/workers/ci/daily_build_group_report_results_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class DailyBuildGroupReportResultsWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineBackgroundQueue
 
     feature_category :code_testing
diff --git a/app/workers/ci/delete_objects_worker.rb b/app/workers/ci/delete_objects_worker.rb
index d845ad61358..ff020a3b048 100644
--- a/app/workers/ci/delete_objects_worker.rb
+++ b/app/workers/ci/delete_objects_worker.rb
@@ -3,9 +3,12 @@
 module Ci
   class DeleteObjectsWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include LimitedCapacity::Worker
 
     feature_category :continuous_integration
+    tags :exclude_from_kubernetes
     idempotent!
 
     def perform_work(*args)
diff --git a/app/workers/ci/delete_unit_tests_worker.rb b/app/workers/ci/delete_unit_tests_worker.rb
new file mode 100644
index 00000000000..ddfc70c43d4
--- /dev/null
+++ b/app/workers/ci/delete_unit_tests_worker.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Ci
+  class DeleteUnitTestsWorker
+    include ApplicationWorker
+    # rubocop:disable Scalability/CronWorkerContext
+    # This worker does not perform work scoped to a context
+    include CronjobQueue
+    # rubocop:enable Scalability/CronWorkerContext
+
+    feature_category :continuous_integration
+    idempotent!
+
+    def perform
+      Ci::DeleteUnitTestsService.new.execute
+    end
+  end
+end
diff --git a/app/workers/ci/drop_pipeline_worker.rb b/app/workers/ci/drop_pipeline_worker.rb
index d19157a47e8..bc158433228 100644
--- a/app/workers/ci/drop_pipeline_worker.rb
+++ b/app/workers/ci/drop_pipeline_worker.rb
@@ -3,8 +3,12 @@
 module Ci
   class DropPipelineWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineQueue
 
+    tags :exclude_from_kubernetes
+
     idempotent!
 
     def perform(pipeline_id, failure_reason)
diff --git a/app/workers/ci/initial_pipeline_process_worker.rb b/app/workers/ci/initial_pipeline_process_worker.rb
index f59726c87fb..4dace43298d 100644
--- a/app/workers/ci/initial_pipeline_process_worker.rb
+++ b/app/workers/ci/initial_pipeline_process_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class InitialPipelineProcessWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineQueue
 
     queue_namespace :pipeline_processing
diff --git a/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb b/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb
index d5e097dc2b5..bd061b5f988 100644
--- a/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb
+++ b/app/workers/ci/merge_requests/add_todo_when_build_fails_worker.rb
@@ -3,9 +3,12 @@ module Ci
   module MergeRequests
     class AddTodoWhenBuildFailsWorker
       include ApplicationWorker
+
+      sidekiq_options retry: 3
       include PipelineQueue
 
       urgency :low
+      tags :exclude_from_kubernetes
       idempotent!
 
       def perform(job_id)
@@ -14,7 +17,7 @@ module Ci
 
         return unless job && project
 
-        ::MergeRequests::AddTodoWhenBuildFailsService.new(job.project, nil).execute(job)
+        ::MergeRequests::AddTodoWhenBuildFailsService.new(project: job.project).execute(job)
       end
     end
   end
diff --git a/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb b/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
index 4de56f54f44..dd7bfff4eb1 100644
--- a/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
@@ -4,9 +4,12 @@ module Ci
   module PipelineArtifacts
     class CoverageReportWorker
       include ApplicationWorker
+
+      sidekiq_options retry: 3
       include PipelineBackgroundQueue
 
       feature_category :code_testing
+      tags :exclude_from_kubernetes
 
       idempotent!
 
diff --git a/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb b/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
index 810106e8d9c..558153c69b2 100644
--- a/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
@@ -5,14 +5,17 @@ module Ci
     class CreateQualityReportWorker
       include ApplicationWorker
 
+      sidekiq_options retry: 3
+
       queue_namespace :pipeline_background
       feature_category :code_testing
+      tags :exclude_from_kubernetes
 
       idempotent!
 
       def perform(pipeline_id)
         Ci::Pipeline.find_by_id(pipeline_id).try do |pipeline|
-          Ci::PipelineArtifacts::CreateCodeQualityMrDiffReportService.new.execute(pipeline)
+          Ci::PipelineArtifacts::CreateCodeQualityMrDiffReportService.new(pipeline).execute
         end
       end
     end
diff --git a/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb b/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
index fff979d95a9..004c1d444a2 100644
--- a/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/expire_artifacts_worker.rb
@@ -4,6 +4,8 @@ module Ci
   module PipelineArtifacts
     class ExpireArtifactsWorker
       include ApplicationWorker
+
+      sidekiq_options retry: 3
       # rubocop:disable Scalability/CronWorkerContext
       # This worker does not perform work scoped to a context
       include CronjobQueue
@@ -12,6 +14,7 @@ module Ci
       deduplicate :until_executed, including_scheduled: true
       idempotent!
       feature_category :continuous_integration
+      tags :exclude_from_kubernetes
 
       def perform
         service = ::Ci::PipelineArtifacts::DestroyAllExpiredService.new
diff --git a/app/workers/ci/pipeline_bridge_status_worker.rb b/app/workers/ci/pipeline_bridge_status_worker.rb
index 3f92f4561e0..3630331b41d 100644
--- a/app/workers/ci/pipeline_bridge_status_worker.rb
+++ b/app/workers/ci/pipeline_bridge_status_worker.rb
@@ -5,6 +5,7 @@ module Ci
     include ::ApplicationWorker
     include ::PipelineQueue
 
+    sidekiq_options retry: 3
     urgency :high
     worker_resource_boundary :cpu
 
diff --git a/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb b/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb
index bc31876aa1d..b0921f6e10b 100644
--- a/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb
+++ b/app/workers/ci/pipeline_success_unlock_artifacts_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class PipelineSuccessUnlockArtifactsWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineBackgroundQueue
 
     idempotent!
diff --git a/app/workers/ci/ref_delete_unlock_artifacts_worker.rb b/app/workers/ci/ref_delete_unlock_artifacts_worker.rb
index aaa77efbb74..d20c501100e 100644
--- a/app/workers/ci/ref_delete_unlock_artifacts_worker.rb
+++ b/app/workers/ci/ref_delete_unlock_artifacts_worker.rb
@@ -3,6 +3,8 @@
 module Ci
   class RefDeleteUnlockArtifactsWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineBackgroundQueue
 
     idempotent!
diff --git a/app/workers/ci/resource_groups/assign_resource_from_resource_group_worker.rb b/app/workers/ci/resource_groups/assign_resource_from_resource_group_worker.rb
index 8063e34a1b8..15ed89fd00e 100644
--- a/app/workers/ci/resource_groups/assign_resource_from_resource_group_worker.rb
+++ b/app/workers/ci/resource_groups/assign_resource_from_resource_group_worker.rb
@@ -4,6 +4,8 @@ module Ci
   module ResourceGroups
     class AssignResourceFromResourceGroupWorker # rubocop:disable Scalability/IdempotentWorker
       include ApplicationWorker
+
+      sidekiq_options retry: 3
       include PipelineQueue
 
       queue_namespace :pipeline_processing
diff --git a/app/workers/ci/retry_pipeline_worker.rb b/app/workers/ci/retry_pipeline_worker.rb
new file mode 100644
index 00000000000..7a1906b3ef9
--- /dev/null
+++ b/app/workers/ci/retry_pipeline_worker.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Ci
+  class RetryPipelineWorker # rubocop:disable Scalability/IdempotentWorker
+    include ::ApplicationWorker
+    include ::PipelineQueue
+
+    urgency :high
+    worker_resource_boundary :cpu
+
+    def perform(pipeline_id, user_id)
+      ::Ci::Pipeline.find_by_id(pipeline_id).try do |pipeline|
+        ::User.find_by_id(user_id).try do |user|
+          pipeline.retry_failed(user)
+        end
+      end
+    end
+  end
+end
diff --git a/app/workers/ci/schedule_delete_objects_cron_worker.rb b/app/workers/ci/schedule_delete_objects_cron_worker.rb
index fa0b15deb56..6489665fafd 100644
--- a/app/workers/ci/schedule_delete_objects_cron_worker.rb
+++ b/app/workers/ci/schedule_delete_objects_cron_worker.rb
@@ -3,12 +3,15 @@
 module Ci
   class ScheduleDeleteObjectsCronWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     # rubocop:disable Scalability/CronWorkerContext
     # This worker does not perform work scoped to a context
     include CronjobQueue
     # rubocop:enable Scalability/CronWorkerContext
 
     feature_category :continuous_integration
+    tags :exclude_from_kubernetes
     idempotent!
 
     def perform(*args)
diff --git a/app/workers/ci/test_failure_history_worker.rb b/app/workers/ci/test_failure_history_worker.rb
index e1562cb3836..3937f720788 100644
--- a/app/workers/ci/test_failure_history_worker.rb
+++ b/app/workers/ci/test_failure_history_worker.rb
@@ -3,8 +3,12 @@
 module Ci
   class TestFailureHistoryWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineBackgroundQueue
 
+    tags :exclude_from_kubernetes
+
     idempotent!
 
     def perform(pipeline_id)