Add latest changes from gitlab-org/gitlab@master

2021-04-30 18:10:09 +00:00 · 2021-04-30 18:10:09 +00:00 · d899d2a373
parent 69d28d313c
commit d899d2a373
300 changed files with 1325 additions and 56 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-76c3ec82133c6c2faea451440f2bd491dda4e94f
+516e2a4a71a41e48465de590d9eaea2f8085e088
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@ -302,6 +302,7 @@ module ApplicationSettingsHelper
      :sourcegraph_public_only,
      :spam_check_endpoint_enabled,
      :spam_check_endpoint_url,
+      :spam_check_api_key,
      :terminal_max_session_time,
      :terms,
      :throttle_authenticated_api_enabled,
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@ -134,6 +134,14 @@ class ApplicationSetting < ApplicationRecord
            presence: true,
            if: :akismet_enabled

+  validates :spam_check_api_key,
+            length: { maximum: 2000, message: _('is too long (maximum is %{count} characters)') },
+            allow_blank: true
+
+  validates :spam_check_api_key,
+            presence: true,
+            if: :spam_check_endpoint_enabled
+
  validates :unique_ips_limit_per_user,
            numericality: { greater_than_or_equal_to: 1 },
            presence: true,
@ -516,6 +524,7 @@ class ApplicationSetting < ApplicationRecord
  attr_encrypted :lets_encrypt_private_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :eks_secret_access_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :akismet_api_key, encryption_options_base_32_aes_256_gcm
+  attr_encrypted :spam_check_api_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :elasticsearch_aws_secret_access_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :recaptcha_private_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :recaptcha_site_key, encryption_options_base_32_aes_256_gcm
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@ -38,6 +38,7 @@ module ApplicationSettingImplementation
        admin_mode: false,
        after_sign_up_text: nil,
        akismet_enabled: false,
+        akismet_api_key: nil,
        allow_local_requests_from_system_hooks: true,
        allow_local_requests_from_web_hooks_and_services: false,
        asset_proxy_enabled: false,
@ -149,6 +150,7 @@ module ApplicationSettingImplementation
        sourcegraph_url: nil,
        spam_check_endpoint_enabled: false,
        spam_check_endpoint_url: nil,
+        spam_check_api_key: nil,
        terminal_max_session_time: 0,
        throttle_authenticated_api_enabled: false,
        throttle_authenticated_api_period_in_seconds: 3600,
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@ -1218,11 +1218,18 @@ module Ci
    # We need `base_and_ancestors` in a specific order to "break" when needed.
    # If we use `find_each`, then the order is broken.
    # rubocop:disable Rails/FindEach
-    def reset_ancestor_bridges!
-      base_and_ancestors.includes(:source_bridge).each do |pipeline|
-        break unless pipeline.bridge_waiting?
+    def reset_source_bridge!(current_user)
+      if ::Feature.enabled?(:ci_reset_bridge_with_subsequent_jobs, project, default_enabled: :yaml)
+        return unless bridge_waiting?

-        pipeline.source_bridge.pending!
+        source_bridge.pending!
+        Ci::AfterRequeueJobService.new(project, current_user).execute(source_bridge) # rubocop:disable CodeReuse/ServiceClass
+      else
+        base_and_ancestors.includes(:source_bridge).each do |pipeline|
+          break unless pipeline.bridge_waiting?
+
+          pipeline.source_bridge.pending!
+        end
      end
    end
    # rubocop:enable Rails/FindEach
--- a/app/services/ci/after_requeue_job_service.rb
+++ b/app/services/ci/after_requeue_job_service.rb
@ -4,7 +4,7 @@ module Ci
  class AfterRequeueJobService < ::BaseService
    def execute(processable)
      process_subsequent_jobs(processable)
-      reset_ancestor_bridges(processable)
+      reset_source_bridge(processable)
    end

    private
@ -15,8 +15,8 @@ module Ci
      end
    end

-    def reset_ancestor_bridges(processable)
-      processable.pipeline.reset_ancestor_bridges!
+    def reset_source_bridge(processable)
+      processable.pipeline.reset_source_bridge!(current_user)
    end

    def process(processable)
--- a/app/services/ci/retry_pipeline_service.rb
+++ b/app/services/ci/retry_pipeline_service.rb
@ -26,7 +26,7 @@ module Ci
        retry_optimistic_lock(skipped, name: 'ci_retry_pipeline') { |build| build.process(current_user) }
      end

-      pipeline.reset_ancestor_bridges!
+      pipeline.reset_source_bridge!(current_user)

      ::MergeRequests::AddTodoWhenBuildFailsService
        .new(project, current_user)
--- a/app/views/admin/application_settings/_spam.html.haml
+++ b/app/views/admin/application_settings/_spam.html.haml
@ -78,5 +78,9 @@
    .form-group
      = f.label :spam_check_endpoint_url, _('URL of the external Spam Check endpoint'), class: 'label-bold'
      = f.text_field :spam_check_endpoint_url, class: 'form-control gl-form-input'
+    .form-group
+      = f.label :spam_check_api_key, _('Spam Check API Key'), class: 'gl-font-weight-bold'
+      = f.text_field :spam_check_api_key, class: 'form-control gl-form-input'
+      .form-text.text-muted= _('The API key used by GitLab for accessing the Spam Check service endpoint')

  = f.submit _('Save changes'), class: "gl-button btn btn-confirm"
--- a/app/workers/admin_email_worker.rb
+++ b/app/workers/admin_email_worker.rb
@ -2,6 +2,8 @@

 class AdminEmailWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue
--- a/app/workers/analytics/instance_statistics/count_job_trigger_worker.rb
+++ b/app/workers/analytics/instance_statistics/count_job_trigger_worker.rb
@ -5,6 +5,8 @@ module Analytics
    # This worker will be removed in 14.0
    class CountJobTriggerWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

      feature_category :devops_reports
--- a/app/workers/analytics/instance_statistics/counter_job_worker.rb
+++ b/app/workers/analytics/instance_statistics/counter_job_worker.rb
@ -6,6 +6,8 @@ module Analytics
    class CounterJobWorker
      include ApplicationWorker

+      sidekiq_options retry: 3
+
      feature_category :devops_reports
      urgency :low

--- a/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
+++ b/app/workers/analytics/usage_trends/count_job_trigger_worker.rb
@ -5,6 +5,8 @@ module Analytics
    class CountJobTriggerWorker
      extend ::Gitlab::Utils::Override
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

      DEFAULT_DELAY = 3.minutes.freeze
--- a/app/workers/analytics/usage_trends/counter_job_worker.rb
+++ b/app/workers/analytics/usage_trends/counter_job_worker.rb
@ -6,6 +6,8 @@ module Analytics
      extend ::Gitlab::Utils::Override
      include ApplicationWorker

+      sidekiq_options retry: 3
+
      feature_category :devops_reports
      urgency :low

--- a/app/workers/approve_blocked_pending_approval_users_worker.rb
+++ b/app/workers/approve_blocked_pending_approval_users_worker.rb
@ -3,6 +3,8 @@
 class ApproveBlockedPendingApprovalUsersWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  idempotent!

  feature_category :users
--- a/app/workers/archive_trace_worker.rb
+++ b/app/workers/archive_trace_worker.rb
@ -2,6 +2,8 @@

 class ArchiveTraceWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineBackgroundQueue

  # rubocop: disable CodeReuse/ActiveRecord
--- a/app/workers/authorized_keys_worker.rb
+++ b/app/workers/authorized_keys_worker.rb
@ -3,6 +3,8 @@
 class AuthorizedKeysWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  PERMITTED_ACTIONS = %w[add_key remove_key].freeze

  feature_category :source_code_management
--- a/app/workers/authorized_project_update/periodic_recalculate_worker.rb
+++ b/app/workers/authorized_project_update/periodic_recalculate_worker.rb
@ -3,6 +3,8 @@
 module AuthorizedProjectUpdate
  class PeriodicRecalculateWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    # This worker does not perform work scoped to a context
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

--- a/app/workers/authorized_project_update/project_create_worker.rb
+++ b/app/workers/authorized_project_update/project_create_worker.rb
@ -4,6 +4,8 @@ module AuthorizedProjectUpdate
  class ProjectCreateWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    feature_category :authentication_and_authorization
    urgency :low
    queue_namespace :authorized_project_update
--- a/app/workers/authorized_project_update/project_group_link_create_worker.rb
+++ b/app/workers/authorized_project_update/project_group_link_create_worker.rb
@ -4,6 +4,8 @@ module AuthorizedProjectUpdate
  class ProjectGroupLinkCreateWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    feature_category :authentication_and_authorization
    urgency :low
    queue_namespace :authorized_project_update
--- a/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb
+++ b/app/workers/authorized_project_update/user_refresh_over_user_range_worker.rb
@ -15,6 +15,8 @@ module AuthorizedProjectUpdate

    include ApplicationWorker

+    sidekiq_options retry: 3
+
    feature_category :authentication_and_authorization
    urgency :low
    queue_namespace :authorized_project_update
--- a/app/workers/authorized_projects_worker.rb
+++ b/app/workers/authorized_projects_worker.rb
@ -2,6 +2,8 @@

 class AuthorizedProjectsWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  prepend WaitableWorker

  feature_category :authentication_and_authorization
--- a/app/workers/auto_devops/disable_worker.rb
+++ b/app/workers/auto_devops/disable_worker.rb
@ -3,6 +3,8 @@
 module AutoDevops
  class DisableWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include AutoDevopsQueue

    def perform(pipeline_id)
--- a/app/workers/auto_merge_process_worker.rb
+++ b/app/workers/auto_merge_process_worker.rb
@ -3,6 +3,8 @@
 class AutoMergeProcessWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  queue_namespace :auto_merge
  feature_category :continuous_delivery
  worker_resource_boundary :cpu
--- a/app/workers/background_migration_worker.rb
+++ b/app/workers/background_migration_worker.rb
@ -3,6 +3,8 @@
 class BackgroundMigrationWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :database
  urgency :throttled
  loggable_arguments 0, 1
--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
@ -2,6 +2,8 @@

 class BuildFinishedWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineQueue

  queue_namespace :pipeline_processing
--- a/app/workers/build_hooks_worker.rb
+++ b/app/workers/build_hooks_worker.rb
@ -2,6 +2,8 @@

 class BuildHooksWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineQueue

  queue_namespace :pipeline_hooks
--- a/app/workers/build_queue_worker.rb
+++ b/app/workers/build_queue_worker.rb
@ -2,6 +2,8 @@

 class BuildQueueWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineQueue

  queue_namespace :pipeline_processing
--- a/app/workers/build_success_worker.rb
+++ b/app/workers/build_success_worker.rb
@ -2,6 +2,8 @@

 class BuildSuccessWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineQueue

  queue_namespace :pipeline_processing
--- a/app/workers/chaos/cpu_spin_worker.rb
+++ b/app/workers/chaos/cpu_spin_worker.rb
@ -3,6 +3,8 @@
 module Chaos
  class CpuSpinWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include ChaosQueue

    def perform(duration_s)
--- a/app/workers/chaos/db_spin_worker.rb
+++ b/app/workers/chaos/db_spin_worker.rb
@ -3,6 +3,8 @@
 module Chaos
  class DbSpinWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include ChaosQueue

    def perform(duration_s, interval_s)
--- a/app/workers/chaos/leak_mem_worker.rb
+++ b/app/workers/chaos/leak_mem_worker.rb
@ -3,6 +3,8 @@
 module Chaos
  class LeakMemWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include ChaosQueue

    def perform(memory_mb, duration_s)
--- a/app/workers/chaos/sleep_worker.rb
+++ b/app/workers/chaos/sleep_worker.rb
@ -3,6 +3,8 @@
 module Chaos
  class SleepWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include ChaosQueue

    def perform(duration_s)
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- a/app/workers/ci/delete_objects_worker.rb
+++ b/app/workers/ci/delete_objects_worker.rb
@ -3,6 +3,8 @@
 module Ci
  class DeleteObjectsWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include LimitedCapacity::Worker

    feature_category :continuous_integration
--- a/app/workers/ci/drop_pipeline_worker.rb
+++ b/app/workers/ci/drop_pipeline_worker.rb
@ -3,6 +3,8 @@
 module Ci
  class DropPipelineWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include PipelineQueue

    idempotent!
--- 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
--- 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,6 +3,8 @@ module Ci
  module MergeRequests
    class AddTodoWhenBuildFailsWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include PipelineQueue

      urgency :low
--- a/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/coverage_report_worker.rb
@ -4,6 +4,8 @@ module Ci
  module PipelineArtifacts
    class CoverageReportWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include PipelineBackgroundQueue

      feature_category :code_testing
--- a/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
+++ b/app/workers/ci/pipeline_artifacts/create_quality_report_worker.rb
@ -5,6 +5,8 @@ module Ci
    class CreateQualityReportWorker
      include ApplicationWorker

+      sidekiq_options retry: 3
+
      queue_namespace :pipeline_background
      feature_category :code_testing

--- 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
--- 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

--- 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!
--- 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!
--- 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
--- a/app/workers/ci/schedule_delete_objects_cron_worker.rb
+++ b/app/workers/ci/schedule_delete_objects_cron_worker.rb
@ -3,6 +3,8 @@
 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
--- a/app/workers/ci/test_failure_history_worker.rb
+++ b/app/workers/ci/test_failure_history_worker.rb
@ -3,6 +3,8 @@
 module Ci
  class TestFailureHistoryWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include PipelineBackgroundQueue

    idempotent!
--- a/app/workers/ci_platform_metrics_update_cron_worker.rb
+++ b/app/workers/ci_platform_metrics_update_cron_worker.rb
@ -3,6 +3,8 @@
 class CiPlatformMetricsUpdateCronWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  # This worker does not perform work scoped to a context
  include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

--- a/app/workers/cleanup_container_repository_worker.rb
+++ b/app/workers/cleanup_container_repository_worker.rb
@ -3,6 +3,8 @@
 class CleanupContainerRepositoryWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  queue_namespace :container_repository
  feature_category :container_registry
  urgency :low
--- a/app/workers/cluster_configure_istio_worker.rb
+++ b/app/workers/cluster_configure_istio_worker.rb
@ -2,6 +2,8 @@

 class ClusterConfigureIstioWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue

  worker_has_external_dependencies!
--- a/app/workers/cluster_install_app_worker.rb
+++ b/app/workers/cluster_install_app_worker.rb
@ -2,6 +2,8 @@

 class ClusterInstallAppWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue
  include ClusterApplications

--- a/app/workers/cluster_patch_app_worker.rb
+++ b/app/workers/cluster_patch_app_worker.rb
@ -2,6 +2,8 @@

 class ClusterPatchAppWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue
  include ClusterApplications

--- a/app/workers/cluster_provision_worker.rb
+++ b/app/workers/cluster_provision_worker.rb
@ -2,6 +2,8 @@

 class ClusterProvisionWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue

  worker_has_external_dependencies!
--- a/app/workers/cluster_upgrade_app_worker.rb
+++ b/app/workers/cluster_upgrade_app_worker.rb
@ -2,6 +2,8 @@

 class ClusterUpgradeAppWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue
  include ClusterApplications

--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@ -2,6 +2,8 @@

 class ClusterWaitForAppInstallationWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue
  include ClusterApplications

--- a/app/workers/cluster_wait_for_app_update_worker.rb
+++ b/app/workers/cluster_wait_for_app_update_worker.rb
@ -2,6 +2,8 @@

 class ClusterWaitForAppUpdateWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue
  include ClusterApplications

--- a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
+++ b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
@ -2,6 +2,8 @@

 class ClusterWaitForIngressIpAddressWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ClusterQueue
  include ClusterApplications

--- a/app/workers/clusters/applications/activate_service_worker.rb
+++ b/app/workers/clusters/applications/activate_service_worker.rb
@ -4,6 +4,8 @@ module Clusters
  module Applications
    class ActivateServiceWorker # rubocop:disable Scalability/IdempotentWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include ClusterQueue

      loggable_arguments 1
--- a/app/workers/clusters/applications/check_prometheus_health_worker.rb
+++ b/app/workers/clusters/applications/check_prometheus_health_worker.rb
@ -4,6 +4,8 @@ module Clusters
  module Applications
    class CheckPrometheusHealthWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      # rubocop:disable Scalability/CronWorkerContext
      # This worker does not perform work scoped to a context
      include CronjobQueue
--- a/app/workers/clusters/applications/deactivate_service_worker.rb
+++ b/app/workers/clusters/applications/deactivate_service_worker.rb
@ -4,6 +4,8 @@ module Clusters
  module Applications
    class DeactivateServiceWorker # rubocop:disable Scalability/IdempotentWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include ClusterQueue

      loggable_arguments 1
--- a/app/workers/clusters/applications/uninstall_worker.rb
+++ b/app/workers/clusters/applications/uninstall_worker.rb
@ -4,6 +4,8 @@ module Clusters
  module Applications
    class UninstallWorker # rubocop:disable Scalability/IdempotentWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include ClusterQueue
      include ClusterApplications

--- a/app/workers/clusters/applications/wait_for_uninstall_app_worker.rb
+++ b/app/workers/clusters/applications/wait_for_uninstall_app_worker.rb
@ -4,6 +4,8 @@ module Clusters
  module Applications
    class WaitForUninstallAppWorker # rubocop:disable Scalability/IdempotentWorker
      include ApplicationWorker
+
+      sidekiq_options retry: 3
      include ClusterQueue
      include ClusterApplications

--- a/app/workers/concerns/gitlab/github_import/object_importer.rb
+++ b/app/workers/concerns/gitlab/github_import/object_importer.rb
@ -9,6 +9,8 @@ module Gitlab

      included do
        include ApplicationWorker
+
+        sidekiq_options retry: 3
        include GithubImport::Queue
        include ReschedulingMethods
        include Gitlab::NotifyUponDeath
--- a/app/workers/concerns/gitlab/jira_import/import_worker.rb
+++ b/app/workers/concerns/gitlab/jira_import/import_worker.rb
@ -7,6 +7,8 @@ module Gitlab

      included do
        include ApplicationWorker
+
+        sidekiq_options retry: 3
        include ProjectImportOptions
        include Gitlab::JiraImport::QueueOptions
      end
--- a/app/workers/concerns/reactive_cacheable_worker.rb
+++ b/app/workers/concerns/reactive_cacheable_worker.rb
@ -6,6 +6,8 @@ module ReactiveCacheableWorker
  included do
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    feature_category_not_owned!
    loggable_arguments 0

--- a/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
+++ b/app/workers/container_expiration_policies/cleanup_container_repository_worker.rb
@ -3,6 +3,8 @@
 module ContainerExpirationPolicies
  class CleanupContainerRepositoryWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include LimitedCapacity::Worker
    include Gitlab::Utils::StrongMemoize

--- a/app/workers/container_expiration_policy_worker.rb
+++ b/app/workers/container_expiration_policy_worker.rb
@ -2,6 +2,8 @@

 class ContainerExpirationPolicyWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include CronjobQueue
  include ExclusiveLeaseGuard

--- a/app/workers/create_commit_signature_worker.rb
+++ b/app/workers/create_commit_signature_worker.rb
@ -3,6 +3,8 @@
 class CreateCommitSignatureWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :source_code_management
  weight 2
  idempotent!
--- a/app/workers/create_note_diff_file_worker.rb
+++ b/app/workers/create_note_diff_file_worker.rb
@ -3,6 +3,8 @@
 class CreateNoteDiffFileWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :code_review

  def perform(diff_note_id)
--- a/app/workers/create_pipeline_worker.rb
+++ b/app/workers/create_pipeline_worker.rb
@ -2,6 +2,8 @@

 class CreatePipelineWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineQueue

  queue_namespace :pipeline_creation
--- a/app/workers/database/batched_background_migration_worker.rb
+++ b/app/workers/database/batched_background_migration_worker.rb
@ -3,6 +3,8 @@
 module Database
  class BatchedBackgroundMigrationWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :database
--- a/app/workers/delete_container_repository_worker.rb
+++ b/app/workers/delete_container_repository_worker.rb
@ -2,6 +2,8 @@

 class DeleteContainerRepositoryWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ExclusiveLeaseGuard

  queue_namespace :container_repository
--- a/app/workers/delete_diff_files_worker.rb
+++ b/app/workers/delete_diff_files_worker.rb
@ -3,6 +3,8 @@
 class DeleteDiffFilesWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :code_review

  # rubocop: disable CodeReuse/ActiveRecord
--- a/app/workers/delete_merged_branches_worker.rb
+++ b/app/workers/delete_merged_branches_worker.rb
@ -3,6 +3,8 @@
 class DeleteMergedBranchesWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :source_code_management

  def perform(project_id, user_id)
--- a/app/workers/delete_stored_files_worker.rb
+++ b/app/workers/delete_stored_files_worker.rb
@ -3,6 +3,8 @@
 class DeleteStoredFilesWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category_not_owned!
  loggable_arguments 0

--- a/app/workers/delete_user_worker.rb
+++ b/app/workers/delete_user_worker.rb
@ -3,6 +3,8 @@
 class DeleteUserWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :authentication_and_authorization
  loggable_arguments 2

--- a/app/workers/deployments/drop_older_deployments_worker.rb
+++ b/app/workers/deployments/drop_older_deployments_worker.rb
@ -4,6 +4,8 @@ module Deployments
  class DropOlderDeploymentsWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    queue_namespace :deployment
    feature_category :continuous_delivery

--- a/app/workers/deployments/execute_hooks_worker.rb
+++ b/app/workers/deployments/execute_hooks_worker.rb
@ -5,6 +5,8 @@ module Deployments
  class ExecuteHooksWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    queue_namespace :deployment
    feature_category :continuous_delivery
    worker_resource_boundary :cpu
--- a/app/workers/deployments/finished_worker.rb
+++ b/app/workers/deployments/finished_worker.rb
@ -6,6 +6,8 @@ module Deployments
  class FinishedWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    queue_namespace :deployment
    feature_category :continuous_delivery
    worker_resource_boundary :cpu
--- a/app/workers/deployments/forward_deployment_worker.rb
+++ b/app/workers/deployments/forward_deployment_worker.rb
@ -6,6 +6,8 @@ module Deployments
  class ForwardDeploymentWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    queue_namespace :deployment
    feature_category :continuous_delivery

--- a/app/workers/deployments/link_merge_request_worker.rb
+++ b/app/workers/deployments/link_merge_request_worker.rb
@ -4,6 +4,8 @@ module Deployments
  class LinkMergeRequestWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    queue_namespace :deployment
    idempotent!
    feature_category :continuous_delivery
--- a/app/workers/deployments/success_worker.rb
+++ b/app/workers/deployments/success_worker.rb
@ -6,6 +6,8 @@ module Deployments
  class SuccessWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    queue_namespace :deployment
    feature_category :continuous_delivery
    worker_resource_boundary :cpu
--- a/app/workers/deployments/update_environment_worker.rb
+++ b/app/workers/deployments/update_environment_worker.rb
@ -4,6 +4,8 @@ module Deployments
  class UpdateEnvironmentWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    queue_namespace :deployment
    idempotent!
    feature_category :continuous_delivery
--- a/app/workers/design_management/copy_design_collection_worker.rb
+++ b/app/workers/design_management/copy_design_collection_worker.rb
@ -4,6 +4,8 @@ module DesignManagement
  class CopyDesignCollectionWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    feature_category :design_management
    idempotent!
    urgency :low
--- a/app/workers/design_management/new_version_worker.rb
+++ b/app/workers/design_management/new_version_worker.rb
@ -4,6 +4,8 @@ module DesignManagement
  class NewVersionWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    feature_category :design_management
    # Declare this worker as memory bound due to
    # `GenerateImageVersionsService` resizing designs
--- a/app/workers/disallow_two_factor_for_group_worker.rb
+++ b/app/workers/disallow_two_factor_for_group_worker.rb
@ -2,6 +2,8 @@

 class DisallowTwoFactorForGroupWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ExceptionBacktrace

  feature_category :subgroups
--- a/app/workers/disallow_two_factor_for_subgroups_worker.rb
+++ b/app/workers/disallow_two_factor_for_subgroups_worker.rb
@ -2,6 +2,8 @@

 class DisallowTwoFactorForSubgroupsWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ExceptionBacktrace

  INTERVAL = 2.seconds.to_i
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@ -3,6 +3,8 @@
 class EmailReceiverWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :issue_tracking
  urgency :high
  weight 2
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@ -3,6 +3,8 @@
 class EmailsOnPushWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  attr_reader :email, :skip_premailer

  feature_category :source_code_management
--- a/app/workers/environments/auto_stop_cron_worker.rb
+++ b/app/workers/environments/auto_stop_cron_worker.rb
@ -3,6 +3,8 @@
 module Environments
  class AutoStopCronWorker # rubocop:disable Scalability/IdempotentWorker
    include ApplicationWorker
+
+    sidekiq_options retry: 3
    include CronjobQueue # rubocop:disable Scalability/CronWorkerContext

    feature_category :continuous_delivery
--- a/app/workers/error_tracking_issue_link_worker.rb
+++ b/app/workers/error_tracking_issue_link_worker.rb
@ -7,6 +7,8 @@
 #   until the prior link is deleted.
 class ErrorTrackingIssueLinkWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include ExclusiveLeaseGuard
  include Gitlab::Utils::StrongMemoize

--- a/app/workers/experiments/record_conversion_event_worker.rb
+++ b/app/workers/experiments/record_conversion_event_worker.rb
@ -4,6 +4,8 @@ module Experiments
  class RecordConversionEventWorker
    include ApplicationWorker

+    sidekiq_options retry: 3
+
    feature_category :users
    urgency :low

--- a/app/workers/expire_build_artifacts_worker.rb
+++ b/app/workers/expire_build_artifacts_worker.rb
@ -2,6 +2,8 @@

 class ExpireBuildArtifactsWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  # rubocop:disable Scalability/CronWorkerContext
  # This worker does not perform work scoped to a context
  include CronjobQueue
--- a/app/workers/expire_build_instance_artifacts_worker.rb
+++ b/app/workers/expire_build_instance_artifacts_worker.rb
@ -3,6 +3,8 @@
 class ExpireBuildInstanceArtifactsWorker # rubocop:disable Scalability/IdempotentWorker
  include ApplicationWorker

+  sidekiq_options retry: 3
+
  feature_category :continuous_integration

  # rubocop: disable CodeReuse/ActiveRecord
--- a/app/workers/expire_job_cache_worker.rb
+++ b/app/workers/expire_job_cache_worker.rb
@ -2,6 +2,8 @@

 class ExpireJobCacheWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineQueue

  queue_namespace :pipeline_cache
--- a/app/workers/expire_pipeline_cache_worker.rb
+++ b/app/workers/expire_pipeline_cache_worker.rb
@ -2,6 +2,8 @@

 class ExpirePipelineCacheWorker
  include ApplicationWorker
+
+  sidekiq_options retry: 3
  include PipelineQueue

  queue_namespace :pipeline_cache
--- a/Show More
+++ b/Show More