diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-12 00:09:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-12 00:09:27 +0300 |
commit | dedf00033edf1f10d1e4ae64c5771747a2ca815f (patch) | |
tree | 55e2a60ed104d1dbad2bac4a07662ade4c8da65f /app/services/ci | |
parent | 2f9c0a9f2ce0063264549861f8b561b8ccc420a8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci')
-rw-r--r-- | app/services/ci/pipeline_processing/atomic_processing_service.rb | 2 | ||||
-rw-r--r-- | app/services/ci/retry_job_service.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/services/ci/pipeline_processing/atomic_processing_service.rb b/app/services/ci/pipeline_processing/atomic_processing_service.rb index 750272c3ecb..84e5089b0d5 100644 --- a/app/services/ci/pipeline_processing/atomic_processing_service.rb +++ b/app/services/ci/pipeline_processing/atomic_processing_service.rb @@ -93,6 +93,8 @@ module Ci # We do not continue to process the job if the previous status is not completed return unless Ci::HasStatus::COMPLETED_STATUSES.include?(previous_status) + ::Deployments::CreateForJobService.new.execute(job) + Gitlab::OptimisticLocking.retry_lock(job, name: 'atomic_processing_update_job') do |subject| Ci::ProcessBuildService.new(project, subject.user) .execute(subject, previous_status) diff --git a/app/services/ci/retry_job_service.rb b/app/services/ci/retry_job_service.rb index 14ea09f17a0..d7c3e9e7f64 100644 --- a/app/services/ci/retry_job_service.rb +++ b/app/services/ci/retry_job_service.rb @@ -39,7 +39,9 @@ module Ci ::Ci::CopyCrossDatabaseAssociationsService.new.execute(job, new_job) - ::Deployments::CreateForJobService.new.execute(new_job) + if Feature.disabled?(:create_deployment_only_for_processable_jobs, project) + ::Deployments::CreateForJobService.new.execute(new_job) + end ::MergeRequests::AddTodoWhenBuildFailsService .new(project: project) |