Merge branch 'sh-geo-add-legacy-sidekiq-queues' into 'master'

Add back deprecated Geo queues that were removed in 10.6

Closes #5219

See merge request gitlab-org/gitlab-ee!4928

app/workers/all_queues.yml

@@ -107,6 +107,13 @@
 - web_hook
 
 # EE-specific queues
+
+# Deprecated queues: remove after 10.7
+- geo_base_scheduler
+- geo_file_download
+- geo_project_sync
+- geo_repository_shard_sync
+
 - cronjob:clear_shared_runners_minutes
 - cronjob:geo_file_download_dispatch
 - cronjob:geo_metrics_update

config/sidekiq_queues.yml

@@ -88,3 +88,9 @@
   - [export_csv, 1]
   - [object_storage_upload, 1]
   - [object_storage, 1]
+
+  # Deprecated queues: Remove after 10.7
+  - geo_base_scheduler
+  - geo_file_download
+  - geo_project_sync
+  - geo_repository_shard_sync

spec/workers/every_sidekiq_worker_spec.rb

 require 'spec_helper'
 
 describe 'Every Sidekiq worker' do
+  DEPRECATED_QUEUES = %w(geo_base_scheduler geo_file_download geo_project_sync geo_repository_shard_sync).freeze
+
   it 'does not use the default queue' do
     expect(Gitlab::SidekiqConfig.workers.map(&:queue)).not_to include('default')
   end
@@ -16,10 +18,10 @@ describe 'Every Sidekiq worker' do
     worker_queues << ActionMailer::DeliveryJob.queue_name
     worker_queues << 'default'
 
-    missing_from_file = worker_queues - file_worker_queues
+    missing_from_file = worker_queues - file_worker_queues - DEPRECATED_QUEUES
     expect(missing_from_file).to be_empty, "expected #{missing_from_file.to_a.inspect} to be in app/workers/all_queues.yml"
 
-    unncessarily_in_file = file_worker_queues - worker_queues
+    unncessarily_in_file = file_worker_queues - worker_queues - DEPRECATED_QUEUES
     expect(unncessarily_in_file).to be_empty, "expected #{unncessarily_in_file.to_a.inspect} not to be in app/workers/all_queues.yml"
   end