Simplify pipeline sidekiq queues naming scheme

2 files changed, 5 insertions, 5 deletions

diff --git a/app/workers/concerns/pipeline_queue.rb b/app/workers/concerns/pipeline_queue.rb
index ed882e3ecef..ddf45b91345 100644
--- a/app/workers/concerns/pipeline_queue.rb
+++ b/app/workers/concerns/pipeline_queue.rb
@@ -5,14 +5,14 @@ module PipelineQueue
   extend ActiveSupport::Concern
 
   included do
-    sidekiq_options queue: 'pipelines-default'
+    sidekiq_options queue: 'pipeline_default'
   end
 
   class_methods do
-    def enqueue_in(queue:, group:)
-      raise ArgumentError if queue.empty? || group.empty?
+    def enqueue_in(group:)
+      raise ArgumentError, 'Unspecified queue group!' if group.empty?
 
-      sidekiq_options queue: "pipelines-#{queue}-#{group}"
+      sidekiq_options queue: "pipeline_#{group}"
     end
   end
 end
diff --git a/app/workers/pipeline_update_worker.rb b/app/workers/pipeline_update_worker.rb
index 086d00b7ec8..5fa399dff4c 100644
--- a/app/workers/pipeline_update_worker.rb
+++ b/app/workers/pipeline_update_worker.rb
@@ -2,7 +2,7 @@ class PipelineUpdateWorker
   include Sidekiq::Worker
   include PipelineQueue
 
-  enqueue_in queue: :pipeline, group: :processing
+  enqueue_in group: :processing
 
   def perform(pipeline_id)
     Ci::Pipeline.find_by(id: pipeline_id)