Rename Deployments Success worker

9 files changed, 13 insertions, 12 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 009d94c55a9..2cb35520c0c 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -50,7 +50,7 @@ class Deployment < ActiveRecord::Base
 
     after_transition any => :success do |deployment|
       deployment.run_after_commit do
-        Ci::DeploymentSuccessWorker.perform_async(id)
+        Deployments::SuccessWorker.perform_async(id)
       end
     end
   end
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index b081db9f866..39436680540 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -65,7 +65,6 @@
 - pipeline_processing:build_finished
 - pipeline_processing:build_queue
 - pipeline_processing:build_success
-- pipeline_processing:ci_deployment_success
 - pipeline_processing:pipeline_process
 - pipeline_processing:pipeline_success
 - pipeline_processing:pipeline_update
@@ -73,6 +72,8 @@
 - pipeline_processing:update_head_pipeline_for_merge_request
 - pipeline_processing:ci_build_schedule
 
+- deployment:deployments_success
+
 - repository_check:repository_check_clear
 - repository_check:repository_check_batch
 - repository_check:repository_check_single_repository
diff --git a/app/workers/ci/deployment_success_worker.rb b/app/workers/deployments/success_worker.rb
index d54864f6460..fabd6aa12a4 100644
--- a/app/workers/ci/deployment_success_worker.rb
+++ b/app/workers/deployments/success_worker.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-module Ci
-  class DeploymentSuccessWorker
+module Deployments
+  class SuccessWorker
     include ApplicationWorker
-    include PipelineQueue
 
-    queue_namespace :pipeline_processing
+    queue_namespace :deployment
 
     def perform(deployment_id)
       Deployment.find_by_id(deployment_id).try do |deployment|
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 0e723cdeb9c..53e1c8778b6 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -29,6 +29,7 @@
   - [pipeline_creation, 4]
   - [pipeline_default, 3]
   - [pipeline_cache, 3]
+  - [deployment, 3]
   - [pipeline_hooks, 2]
   - [gitlab_shell, 2]
   - [email_receiver, 2]
diff --git a/spec/factories/deployments.rb b/spec/factories/deployments.rb
index cb02fe665e4..309d1132afe 100644
--- a/spec/factories/deployments.rb
+++ b/spec/factories/deployments.rb
@@ -45,7 +45,7 @@ FactoryBot.define do
 
       after(:create) do |deployment, evaluator|
         deployment.update_column(:status, Deployment.state_machine.states['success'].value)
-        Ci::DeploymentSuccessWorker.new.perform(deployment)
+        Deployments::SuccessWorker.new.perform(deployment)
       end
     end
 
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index b2f4c474b99..e8d5296a7d6 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -911,7 +911,7 @@ describe Ci::Build do
 
     context 'when transits to success' do
       before do
-        allow(Ci::DeploymentSuccessWorker).to receive(:perform_async)
+        allow(Deployments::SuccessWorker).to receive(:perform_async)
         build.success!
       end
 
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index 9848bb7dd17..a85d6f30497 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -97,8 +97,8 @@ describe Deployment do
         end
       end
 
-      it 'executes DeploymentSuccessWorker asynchronously' do
-        expect(Ci::DeploymentSuccessWorker)
+      it 'executes Deployments::SuccessWorker asynchronously' do
+        expect(Deployments::SuccessWorker)
           .to receive(:perform_async).with(deployment.id)
 
         deployment.succeed!
diff --git a/spec/services/update_deployment_service_spec.rb b/spec/services/update_deployment_service_spec.rb
index b4cb5d0b11e..ea4b0ad6e02 100644
--- a/spec/services/update_deployment_service_spec.rb
+++ b/spec/services/update_deployment_service_spec.rb
@@ -21,7 +21,7 @@ describe UpdateDeploymentService do
   let(:service) { described_class.new(deployment) }
 
   before do
-    allow(Ci::DeploymentSuccessWorker).to receive(:perform_async)
+    allow(Deployments::SuccessWorker).to receive(:perform_async)
 
     job.success!
   end
diff --git a/spec/workers/ci/deployment_success_worker_spec.rb b/spec/workers/deployments/success_worker_spec.rb
index b112adf7bc8..91e323f202b 100644
--- a/spec/workers/ci/deployment_success_worker_spec.rb
+++ b/spec/workers/deployments/success_worker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Ci::DeploymentSuccessWorker do
+describe Deployments::SuccessWorker do
   subject { described_class.new.perform(deployment&.id) }
 
   context 'when deploy record exists' do