1 files changed, 15 insertions, 1 deletions
diff --git a/app/workers/build_success_worker.rb b/app/workers/build_success_worker.rb
index c17608f7378..9a865fea621 100644
--- a/app/workers/build_success_worker.rb
+++ b/app/workers/build_success_worker.rb
@@ -10,13 +10,27 @@ class BuildSuccessWorker
   def perform(build_id)
     Ci::Build.find_by(id: build_id).try do |build|
       create_deployment(build) if build.has_environment?
+      stop_environment(build) if build.stops_environment?
     end
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
   private
 
+  ##
+  # Deprecated:
+  # As of 11.5, we started creating a deployment record when ci_builds record is created.
+  # Therefore we no longer need to create a deployment, after a build succeeded.
+  # We're leaving this code for the transition period, but we can remove this code in 11.6.
   def create_deployment(build)
-    CreateDeploymentService.new(build).execute
+    build.create_deployment.try do |deployment|
+      deployment.succeed
+    end
+  end
+
+  ##
+  # TODO: This should be processed in DeploymentSuccessWorker once we started storing `action` value in `deployments` records
+  def stop_environment(build)
+    build.persisted_environment.fire_state_event(:stop)
   end
 end