diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/services/deployments | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
| download | gitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/services/deployments')
| -rw-r--r-- | app/services/deployments/older_deployments_drop_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/deployments/older_deployments_drop_service.rb b/app/services/deployments/older_deployments_drop_service.rb index 504b55b99ac..15384fb0db1 100644 --- a/app/services/deployments/older_deployments_drop_service.rb +++ b/app/services/deployments/older_deployments_drop_service.rb @@ -12,6 +12,8 @@ module Deployments return unless @deployment&.running? older_deployments_builds.each do |build| + next if build.manual? + Gitlab::OptimisticLocking.retry_lock(build, name: 'older_deployments_drop') do |build| build.drop(:forward_deployment_failure) end |