Fix runner eternal loop when update job result

Add spec

Add changelog

1 files changed, 8 insertions, 1 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index dc6f8ae1a7f..cfdb3c0d719 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -224,8 +224,15 @@ module Ci
 
       before_transition any => [:failed] do |build|
         next unless build.project
+        next unless build.deployment
 
-        build.deployment&.drop
+        begin
+          build.deployment.drop!
+        rescue => e
+          Gitlab::Sentry.track_exception(e, extra: { build_id: build.id })
+        end
+
+        true
       end
 
       after_transition any => [:failed] do |build|