From 270941d79b60971e21d120063bb4aeb28a9e89c9 Mon Sep 17 00:00:00 2001
From: Gregorius Marco <gmarco@gitlab.com>
Date: Wed, 31 Aug 2022 16:30:36 +0800
Subject: [PATCH] Update default initializer value for Sidekiq routing_rules

We want to update self-managed instances to route all Sidekiq jobs to
the 'default' queue. By updating the Rails initializer, we wouldn't need
to update all other installations such as Omnibus and Helm Chart.
https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1491

Changelog: changed
---
 config/initializers/1_settings.rb             |  2 +-
 config/settings.rb                            |  6 ++++++
 .../index_projects_by_id_service_spec.rb      |  2 +-
 ee/spec/workers/concerns/geo_queue_spec.rb    | 20 ------------------
 .../primary/single_worker_spec.rb             |  3 +--
 .../secondary/single_worker_spec.rb           |  3 +--
 .../geo/reverification_batch_worker_spec.rb   |  1 -
 .../registry_consistency_worker_spec.rb       |  2 +-
 .../secondary_usage_data_cron_worker_spec.rb  |  1 -
 .../geo/sync_timeout_cron_worker_spec.rb      |  1 -
 .../geo/verification_batch_worker_spec.rb     |  1 -
 .../geo/verification_cron_worker_spec.rb      |  2 +-
 ...verification_state_backfill_worker_spec.rb |  1 -
 .../geo/verification_timeout_worker_spec.rb   |  1 -
 spec/config/settings_spec.rb                  | 14 +++++++++++++
 .../duplicate_jobs/server_spec.rb             |  8 +++----
 spec/lib/gitlab/sidekiq_migrate_jobs_spec.rb  |  8 +++----
 spec/lib/gitlab/sidekiq_queue_spec.rb         | 10 ++++-----
 spec/support/rspec_order_todo.yml             |  5 -----
 .../concerns/cluster_agent_queue_spec.rb      |  1 -
 spec/workers/concerns/cluster_queue_spec.rb   | 21 -------------------
 spec/workers/concerns/cronjob_queue_spec.rb   |  4 ----
 .../gitlab/github_import/queue_spec.rb        | 18 ----------------
 .../pipeline_background_queue_spec.rb         | 21 -------------------
 spec/workers/concerns/pipeline_queue_spec.rb  | 21 -------------------
 .../concerns/repository_check_queue_spec.rb   |  4 ----
 spec/workers/concerns/waitable_worker_spec.rb |  3 +--
 .../expired_notification_worker_spec.rb       |  1 -
 .../expiring_soon_notification_worker_spec.rb |  1 -
 29 files changed, 40 insertions(+), 146 deletions(-)
 delete mode 100644 ee/spec/workers/concerns/geo_queue_spec.rb
 delete mode 100644 spec/workers/concerns/cluster_queue_spec.rb
 delete mode 100644 spec/workers/concerns/gitlab/github_import/queue_spec.rb
 delete mode 100644 spec/workers/concerns/pipeline_background_queue_spec.rb
 delete mode 100644 spec/workers/concerns/pipeline_queue_spec.rb

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 83cae631a88f3c..92e1a2f8711f1a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -790,7 +790,7 @@
 #
 Settings['sidekiq'] ||= Settingslogic.new({})
 Settings['sidekiq']['log_format'] ||= 'default'
-Settings['sidekiq']['routing_rules'] ||= []
+Settings['sidekiq']['routing_rules'] = Settings.__send__(:build_sidekiq_routing_rules, Settings['sidekiq']['routing_rules'])
 
 #
 # GitLab Shell
diff --git a/config/settings.rb b/config/settings.rb
index 51d548176468bf..b242e970cc661d 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -204,5 +204,11 @@ def cron_for_service_ping
 
       "#{minute} #{hour} * * #{day_of_week}"
     end
+
+    # Route all jobs to 'default' queue. This setting is meant for self-managed instances use to keep things simple.
+    # See https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1491
+    def build_sidekiq_routing_rules(rules)
+      rules.nil? || rules&.empty? ? [['*', 'default']] : rules
+    end
   end
 end
diff --git a/ee/spec/services/elastic/index_projects_by_id_service_spec.rb b/ee/spec/services/elastic/index_projects_by_id_service_spec.rb
index ed7bf4b8c4c535..83953f0b01f52b 100644
--- a/ee/spec/services/elastic/index_projects_by_id_service_spec.rb
+++ b/ee/spec/services/elastic/index_projects_by_id_service_spec.rb
@@ -14,7 +14,7 @@
         described_class.new.execute(project_ids: [project1.id, project2.id], namespace_ids: [3, 4])
       end
 
-      jobs = Sidekiq::Queues[ElasticNamespaceIndexerWorker.queue]
+      jobs = Sidekiq::Queues.jobs_by_worker[ElasticNamespaceIndexerWorker.name]
 
       expect(jobs.size).to eq(2)
       expect(jobs[0]['args']).to eq([3, 'index'])
diff --git a/ee/spec/workers/concerns/geo_queue_spec.rb b/ee/spec/workers/concerns/geo_queue_spec.rb
deleted file mode 100644
index 5bc6f3bf545098..00000000000000
--- a/ee/spec/workers/concerns/geo_queue_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe GeoQueue do
-  let(:worker) do
-    Class.new do
-      def self.name
-        'DummyWorker'
-      end
-
-      include ApplicationWorker
-      include GeoQueue
-    end
-  end
-
-  it 'sets the queue name of a worker' do
-    expect(worker.sidekiq_options['queue'].to_s).to eq('geo:dummy')
-  end
-end
diff --git a/ee/spec/workers/geo/repository_verification/primary/single_worker_spec.rb b/ee/spec/workers/geo/repository_verification/primary/single_worker_spec.rb
index 044baf6248ad70..96c93f14a77bfa 100644
--- a/ee/spec/workers/geo/repository_verification/primary/single_worker_spec.rb
+++ b/ee/spec/workers/geo/repository_verification/primary/single_worker_spec.rb
@@ -15,10 +15,9 @@
   end
 
   it 'disables retrying of failed jobs' do
-    expect(subject.sidekiq_options_hash).to match(
+    expect(subject.sidekiq_options_hash).to include(
       'retry' => false,
       'version' => an_instance_of(Integer),
-      'queue' => 'geo:geo_repository_verification_primary_single',
       'queue_namespace' => :geo
     )
   end
diff --git a/ee/spec/workers/geo/repository_verification/secondary/single_worker_spec.rb b/ee/spec/workers/geo/repository_verification/secondary/single_worker_spec.rb
index 03badb17079754..825a98fcfd20af 100644
--- a/ee/spec/workers/geo/repository_verification/secondary/single_worker_spec.rb
+++ b/ee/spec/workers/geo/repository_verification/secondary/single_worker_spec.rb
@@ -15,10 +15,9 @@
   end
 
   it 'disables retrying of failed jobs' do
-    expect(subject.sidekiq_options_hash).to match(
+    expect(subject.sidekiq_options_hash).to include(
       'retry' => false,
       'version' => an_instance_of(Integer),
-      'queue' => 'geo:geo_repository_verification_secondary_single',
       'queue_namespace' => :geo
     )
   end
diff --git a/ee/spec/workers/geo/reverification_batch_worker_spec.rb b/ee/spec/workers/geo/reverification_batch_worker_spec.rb
index f6b3c28f5f5ffc..65756d2f99b7ea 100644
--- a/ee/spec/workers/geo/reverification_batch_worker_spec.rb
+++ b/ee/spec/workers/geo/reverification_batch_worker_spec.rb
@@ -15,7 +15,6 @@
 
   it 'uses a Geo queue' do
     expect(job.sidekiq_options_hash).to include(
-      'queue' => 'geo:geo_reverification_batch',
       'queue_namespace' => :geo
     )
   end
diff --git a/ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb b/ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb
index 22ca629676c085..233895d762b832 100644
--- a/ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb
+++ b/ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb
@@ -22,9 +22,9 @@
 
   it 'uses a cronjob queue' do
     expect(subject.sidekiq_options_hash).to include(
-      'queue' => 'cronjob:geo_secondary_registry_consistency',
       'queue_namespace' => :cronjob
     )
+    expect(subject.class.generated_queue_name).to include('cronjob:geo_secondary_registry_consistency')
   end
 
   describe '#perform' do
diff --git a/ee/spec/workers/geo/secondary_usage_data_cron_worker_spec.rb b/ee/spec/workers/geo/secondary_usage_data_cron_worker_spec.rb
index c8b21b8fbcd19a..9b4286b0e83d24 100644
--- a/ee/spec/workers/geo/secondary_usage_data_cron_worker_spec.rb
+++ b/ee/spec/workers/geo/secondary_usage_data_cron_worker_spec.rb
@@ -13,7 +13,6 @@
 
   it 'uses a cronjob queue' do
     expect(subject.sidekiq_options_hash).to include(
-      'queue' => 'cronjob:geo_secondary_usage_data_cron',
       'queue_namespace' => :cronjob
     )
   end
diff --git a/ee/spec/workers/geo/sync_timeout_cron_worker_spec.rb b/ee/spec/workers/geo/sync_timeout_cron_worker_spec.rb
index dc9bfca56f6e3a..14fb8b7e3eebff 100644
--- a/ee/spec/workers/geo/sync_timeout_cron_worker_spec.rb
+++ b/ee/spec/workers/geo/sync_timeout_cron_worker_spec.rb
@@ -17,7 +17,6 @@
 
   it 'uses a cronjob queue' do
     expect(subject.sidekiq_options_hash).to include(
-      'queue' => 'cronjob:geo_sync_timeout_cron',
       'queue_namespace' => :cronjob
     )
   end
diff --git a/ee/spec/workers/geo/verification_batch_worker_spec.rb b/ee/spec/workers/geo/verification_batch_worker_spec.rb
index 179c6bb0d730bb..7655ef36c6bf52 100644
--- a/ee/spec/workers/geo/verification_batch_worker_spec.rb
+++ b/ee/spec/workers/geo/verification_batch_worker_spec.rb
@@ -17,7 +17,6 @@
 
   it 'uses a Geo queue' do
     expect(job.sidekiq_options_hash).to include(
-      'queue' => 'geo:geo_verification_batch',
       'queue_namespace' => :geo
     )
   end
diff --git a/ee/spec/workers/geo/verification_cron_worker_spec.rb b/ee/spec/workers/geo/verification_cron_worker_spec.rb
index aa97cbadff003d..857ea8c3779a7e 100644
--- a/ee/spec/workers/geo/verification_cron_worker_spec.rb
+++ b/ee/spec/workers/geo/verification_cron_worker_spec.rb
@@ -16,8 +16,8 @@
 
   it 'uses a cronjob queue' do
     expect(subject.sidekiq_options_hash).to include(
-      'queue' => 'cronjob:geo_verification_cron',
       'queue_namespace' => :cronjob
     )
+    expect(subject.class.generated_queue_name).to include('cronjob:geo_verification_cron')
   end
 end
diff --git a/ee/spec/workers/geo/verification_state_backfill_worker_spec.rb b/ee/spec/workers/geo/verification_state_backfill_worker_spec.rb
index c6e1278fe687b6..82942d7a53d2a7 100644
--- a/ee/spec/workers/geo/verification_state_backfill_worker_spec.rb
+++ b/ee/spec/workers/geo/verification_state_backfill_worker_spec.rb
@@ -18,7 +18,6 @@
 
   it 'uses a geo queue' do
     expect(subject.sidekiq_options_hash).to include(
-      'queue' => 'geo:geo_verification_state_backfill',
       'queue_namespace' => :geo
     )
   end
diff --git a/ee/spec/workers/geo/verification_timeout_worker_spec.rb b/ee/spec/workers/geo/verification_timeout_worker_spec.rb
index b3f12894d76a24..ccae432c51f3cb 100644
--- a/ee/spec/workers/geo/verification_timeout_worker_spec.rb
+++ b/ee/spec/workers/geo/verification_timeout_worker_spec.rb
@@ -9,7 +9,6 @@
 
   it 'uses a Geo queue' do
     expect(described_class.new.sidekiq_options_hash).to include(
-      'queue' => 'geo:geo_verification_timeout',
       'queue_namespace' => :geo
     )
   end
diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index 10eeb3f5371882..46fd524adbb29a 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -150,4 +150,18 @@
       expect(Settings.encrypted('tmp/tests/test.enc').read).to be_empty
     end
   end
+
+  describe '.build_sidekiq_routing_rules' do
+    [
+      [nil, [['*', 'default']]],
+      [[], [['*', 'default']]],
+      [[['name=foobar', 'foobar']], [['name=foobar', 'foobar']]]
+    ].each do |input_rules, output_rules|
+      context "Given input routing_rules #{input_rules}" do
+        it "returns output routing_rules #{output_rules}" do
+          expect(described_class.send(:build_sidekiq_routing_rules, input_rules)).to eq(output_rules)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb
index 09548d211064bb..cc730e203f6884 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/server_spec.rb
@@ -41,10 +41,10 @@ def self.work
     describe '#call' do
       it 'removes the stored job from redis before execution' do
         bare_job = { 'class' => 'TestDeduplicationWorker', 'args' => ['hello'] }
-        job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'test_deduplication')
+        job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'default')
 
         expect(Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob)
-          .to receive(:new).with(a_hash_including(bare_job), 'test_deduplication')
+          .to receive(:new).with(a_hash_including(bare_job), 'default')
                 .and_return(job_definition).twice # once in client middleware
 
         expect(job_definition).to receive(:delete!).ordered.and_call_original
@@ -60,10 +60,10 @@ def self.work
 
     it 'removes the stored job from redis after execution' do
       bare_job = { 'class' => 'TestDeduplicationWorker', 'args' => ['hello'] }
-      job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'test_deduplication')
+      job_definition = Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob.new(bare_job.dup, 'default')
 
       expect(Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob)
-        .to receive(:new).with(a_hash_including(bare_job), 'test_deduplication')
+        .to receive(:new).with(a_hash_including(bare_job), 'default')
               .and_return(job_definition).twice # once in client middleware
 
       expect(TestDeduplicationWorker).to receive(:work).ordered.and_call_original
diff --git a/spec/lib/gitlab/sidekiq_migrate_jobs_spec.rb b/spec/lib/gitlab/sidekiq_migrate_jobs_spec.rb
index d4391d3023adca..a576cf3e2ab270 100644
--- a/spec/lib/gitlab/sidekiq_migrate_jobs_spec.rb
+++ b/spec/lib/gitlab/sidekiq_migrate_jobs_spec.rb
@@ -46,7 +46,7 @@ def clear_queues
           expect(migrator.execute('PostReceive' => 'new_queue')).to eq(scanned: 3, migrated: 0)
 
           expect(set_after.length).to eq(3)
-          expect(set_after.map(&:first)).to all(include('queue' => 'authorized_projects',
+          expect(set_after.map(&:first)).to all(include('queue' => 'default',
                                                         'class' => 'AuthorizedProjectsWorker'))
         end
       end
@@ -62,7 +62,7 @@ def clear_queues
               if item['class'] == 'AuthorizedProjectsWorker'
                 expect(item).to include('queue' => 'new_queue', 'args' => [i])
               else
-                expect(item).to include('queue' => 'post_receive', 'args' => [i])
+                expect(item).to include('queue' => 'default', 'args' => [i])
               end
 
               expect(score).to be_within(schedule_jitter).of(i.succ.hours.from_now.to_i)
@@ -116,7 +116,7 @@ def clear_queues
             expect(migrator.execute('PostReceive' => 'new_queue')).to eq(scanned: 4, migrated: 0)
 
             expect(set_after.length).to eq(3)
-            expect(set_after.map(&:first)).to all(include('queue' => 'authorized_projects'))
+            expect(set_after.map(&:first)).to all(include('queue' => 'default'))
           end
         end
 
@@ -138,7 +138,7 @@ def clear_queues
           expect(migrator.execute('PostReceive' => 'new_queue')).to eq(scanned: 4, migrated: 1)
 
           expect(set_after.group_by { |job| job.first['queue'] }.transform_values(&:count))
-            .to eq('authorized_projects' => 6, 'new_queue' => 1)
+            .to eq('default' => 6, 'new_queue' => 1)
         end
 
         it 'iterates through the entire set of jobs' do
diff --git a/spec/lib/gitlab/sidekiq_queue_spec.rb b/spec/lib/gitlab/sidekiq_queue_spec.rb
index 5e91282612e98e..93632848788c42 100644
--- a/spec/lib/gitlab/sidekiq_queue_spec.rb
+++ b/spec/lib/gitlab/sidekiq_queue_spec.rb
@@ -4,15 +4,15 @@
 
 RSpec.describe Gitlab::SidekiqQueue, :clean_gitlab_redis_queues do
   around do |example|
-    Sidekiq::Queue.new('default').clear
+    Sidekiq::Queue.new('foobar').clear
     Sidekiq::Testing.disable!(&example)
-    Sidekiq::Queue.new('default').clear
+    Sidekiq::Queue.new('foobar').clear
   end
 
   def add_job(args, user:, klass: 'AuthorizedProjectsWorker')
     Sidekiq::Client.push(
       'class' => klass,
-      'queue' => 'default',
+      'queue' => 'foobar',
       'args' => args,
       'meta.user' => user.username
     )
@@ -20,7 +20,7 @@ def add_job(args, user:, klass: 'AuthorizedProjectsWorker')
 
   describe '#drop_jobs!' do
     shared_examples 'queue processing' do
-      let(:sidekiq_queue) { described_class.new('default') }
+      let(:sidekiq_queue) { described_class.new('foobar') }
       let_it_be(:sidekiq_queue_user) { create(:user) }
 
       before do
@@ -80,7 +80,7 @@ def add_job(args, user:, klass: 'AuthorizedProjectsWorker')
       it 'raises NoMetadataError' do
         add_job([1], user: create(:user))
 
-        expect { described_class.new('default').drop_jobs!({ username: 'sidekiq_queue_user' }, timeout: 1) }
+        expect { described_class.new('foobar').drop_jobs!({ username: 'sidekiq_queue_user' }, timeout: 1) }
           .to raise_error(described_class::NoMetadataError)
       end
     end
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 208c02c028efd9..ffd0095e57a136 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -3448,7 +3448,6 @@
 - './ee/spec/workers/concerns/elastic/indexing_control_spec.rb'
 - './ee/spec/workers/concerns/elastic/migration_obsolete_spec.rb'
 - './ee/spec/workers/concerns/elastic/migration_options_spec.rb'
-- './ee/spec/workers/concerns/geo_queue_spec.rb'
 - './ee/spec/workers/concerns/update_orchestration_policy_configuration_spec.rb'
 - './ee/spec/workers/create_github_webhook_worker_spec.rb'
 - './ee/spec/workers/deployments/auto_rollback_worker_spec.rb'
@@ -10874,18 +10873,14 @@
 - './spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb'
 - './spec/workers/concerns/application_worker_spec.rb'
 - './spec/workers/concerns/cluster_agent_queue_spec.rb'
-- './spec/workers/concerns/cluster_queue_spec.rb'
 - './spec/workers/concerns/cronjob_queue_spec.rb'
 - './spec/workers/concerns/gitlab/github_import/object_importer_spec.rb'
-- './spec/workers/concerns/gitlab/github_import/queue_spec.rb'
 - './spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb'
 - './spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb'
 - './spec/workers/concerns/gitlab/notify_upon_death_spec.rb'
 - './spec/workers/concerns/limited_capacity/job_tracker_spec.rb'
 - './spec/workers/concerns/limited_capacity/worker_spec.rb'
 - './spec/workers/concerns/packages/cleanup_artifact_worker_spec.rb'
-- './spec/workers/concerns/pipeline_background_queue_spec.rb'
-- './spec/workers/concerns/pipeline_queue_spec.rb'
 - './spec/workers/concerns/project_import_options_spec.rb'
 - './spec/workers/concerns/reenqueuer_spec.rb'
 - './spec/workers/concerns/repository_check_queue_spec.rb'
diff --git a/spec/workers/concerns/cluster_agent_queue_spec.rb b/spec/workers/concerns/cluster_agent_queue_spec.rb
index b5189cbd8c84ef..4f67102a0be499 100644
--- a/spec/workers/concerns/cluster_agent_queue_spec.rb
+++ b/spec/workers/concerns/cluster_agent_queue_spec.rb
@@ -14,6 +14,5 @@ def self.name
     end
   end
 
-  it { expect(worker.queue).to eq('cluster_agent:example') }
   it { expect(worker.get_feature_category).to eq(:kubernetes_management) }
 end
diff --git a/spec/workers/concerns/cluster_queue_spec.rb b/spec/workers/concerns/cluster_queue_spec.rb
deleted file mode 100644
index c03ca9cea48622..00000000000000
--- a/spec/workers/concerns/cluster_queue_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ClusterQueue do
-  let(:worker) do
-    Class.new do
-      def self.name
-        'DummyWorker'
-      end
-
-      include ApplicationWorker
-      include ClusterQueue
-    end
-  end
-
-  it 'sets a default pipelines queue automatically' do
-    expect(worker.sidekiq_options['queue'])
-      .to eq 'gcp_cluster:dummy'
-  end
-end
diff --git a/spec/workers/concerns/cronjob_queue_spec.rb b/spec/workers/concerns/cronjob_queue_spec.rb
index 0244535051f00e..7dd016fc78a3b1 100644
--- a/spec/workers/concerns/cronjob_queue_spec.rb
+++ b/spec/workers/concerns/cronjob_queue_spec.rb
@@ -40,10 +40,6 @@ def perform(identifier, *args)
     stub_const("AnotherWorker", another_worker)
   end
 
-  it 'sets the queue name of a worker' do
-    expect(worker.sidekiq_options['queue'].to_s).to eq('cronjob:dummy')
-  end
-
   it 'disables retrying of failed jobs' do
     expect(worker.sidekiq_options['retry']).to eq(false)
   end
diff --git a/spec/workers/concerns/gitlab/github_import/queue_spec.rb b/spec/workers/concerns/gitlab/github_import/queue_spec.rb
deleted file mode 100644
index beca221b593836..00000000000000
--- a/spec/workers/concerns/gitlab/github_import/queue_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::GithubImport::Queue do
-  it 'sets the Sidekiq options for the worker' do
-    worker = Class.new do
-      def self.name
-        'DummyWorker'
-      end
-
-      include ApplicationWorker
-      include Gitlab::GithubImport::Queue
-    end
-
-    expect(worker.sidekiq_options['queue']).to eq('github_importer:dummy')
-  end
-end
diff --git a/spec/workers/concerns/pipeline_background_queue_spec.rb b/spec/workers/concerns/pipeline_background_queue_spec.rb
deleted file mode 100644
index 77c7e7440c5bd3..00000000000000
--- a/spec/workers/concerns/pipeline_background_queue_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe PipelineBackgroundQueue do
-  let(:worker) do
-    Class.new do
-      def self.name
-        'DummyWorker'
-      end
-
-      include ApplicationWorker
-      include PipelineBackgroundQueue
-    end
-  end
-
-  it 'sets a default object storage queue automatically' do
-    expect(worker.sidekiq_options['queue'])
-      .to eq 'pipeline_background:dummy'
-  end
-end
diff --git a/spec/workers/concerns/pipeline_queue_spec.rb b/spec/workers/concerns/pipeline_queue_spec.rb
deleted file mode 100644
index 6c1ac2052e4032..00000000000000
--- a/spec/workers/concerns/pipeline_queue_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe PipelineQueue do
-  let(:worker) do
-    Class.new do
-      def self.name
-        'DummyWorker'
-      end
-
-      include ApplicationWorker
-      include PipelineQueue
-    end
-  end
-
-  it 'sets a default pipelines queue automatically' do
-    expect(worker.sidekiq_options['queue'])
-      .to eq 'pipeline_default:dummy'
-  end
-end
diff --git a/spec/workers/concerns/repository_check_queue_spec.rb b/spec/workers/concerns/repository_check_queue_spec.rb
index ae377c09b3715b..08ac73aac7be41 100644
--- a/spec/workers/concerns/repository_check_queue_spec.rb
+++ b/spec/workers/concerns/repository_check_queue_spec.rb
@@ -14,10 +14,6 @@ def self.name
     end
   end
 
-  it 'sets the queue name of a worker' do
-    expect(worker.sidekiq_options['queue'].to_s).to eq('repository_check:dummy')
-  end
-
   it 'disables retrying of failed jobs' do
     expect(worker.sidekiq_options['retry']).to eq(false)
   end
diff --git a/spec/workers/concerns/waitable_worker_spec.rb b/spec/workers/concerns/waitable_worker_spec.rb
index bf156c3b8cbd94..2df5b60deafdb0 100644
--- a/spec/workers/concerns/waitable_worker_spec.rb
+++ b/spec/workers/concerns/waitable_worker_spec.rb
@@ -49,8 +49,7 @@ def perform(count = 0)
           expect(Gitlab::AppJsonLogger).to(
             receive(:info).with(a_hash_including('message' => 'running inline',
                                                  'class' => 'Gitlab::Foo::Bar::DummyWorker',
-                                                 'job_status' => 'running',
-                                                 'queue' => 'foo_bar_dummy'))
+                                                 'job_status' => 'running'))
                           .once)
 
           worker.bulk_perform_and_wait(args_list)
diff --git a/spec/workers/ssh_keys/expired_notification_worker_spec.rb b/spec/workers/ssh_keys/expired_notification_worker_spec.rb
index 26d9460d73ee84..f93d02e86c0189 100644
--- a/spec/workers/ssh_keys/expired_notification_worker_spec.rb
+++ b/spec/workers/ssh_keys/expired_notification_worker_spec.rb
@@ -7,7 +7,6 @@
 
   it 'uses a cronjob queue' do
     expect(worker.sidekiq_options_hash).to include(
-      'queue' => 'cronjob:ssh_keys_expired_notification',
       'queue_namespace' => :cronjob
     )
   end
diff --git a/spec/workers/ssh_keys/expiring_soon_notification_worker_spec.rb b/spec/workers/ssh_keys/expiring_soon_notification_worker_spec.rb
index e907d035020b70..ed6701532a5a21 100644
--- a/spec/workers/ssh_keys/expiring_soon_notification_worker_spec.rb
+++ b/spec/workers/ssh_keys/expiring_soon_notification_worker_spec.rb
@@ -7,7 +7,6 @@
 
   it 'uses a cronjob queue' do
     expect(worker.sidekiq_options_hash).to include(
-      'queue' => 'cronjob:ssh_keys_expiring_soon_notification',
       'queue_namespace' => :cronjob
     )
   end
-- 
GitLab