diff options
Diffstat (limited to 'app/services/ci/retry_job_service.rb')
| -rw-r--r-- | app/services/ci/retry_job_service.rb | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/app/services/ci/retry_job_service.rb b/app/services/ci/retry_job_service.rb index 74ebaef48b1..da0e80dfed7 100644 --- a/app/services/ci/retry_job_service.rb +++ b/app/services/ci/retry_job_service.rb @@ -28,7 +28,7 @@ module Ci check_access!(job) new_job = job.clone(current_user: current_user, new_job_variables_attributes: variables) - if Feature.enabled?(:ci_retry_job_fix, project) && enqueue_if_actionable && new_job.action? + if enqueue_if_actionable && new_job.action? new_job.set_enqueue_immediately! end @@ -64,15 +64,10 @@ module Ci next if new_job.failed? - Gitlab::OptimisticLocking.retry_lock(new_job, name: 'retry_build', &:enqueue) if Feature.disabled?( - :ci_retry_job_fix, project) + ResetSkippedJobsService.new(project, current_user).execute(job) - AfterRequeueJobService.new(project, current_user).execute(job) - - if Feature.enabled?(:ci_retry_job_fix, project) - Ci::PipelineCreation::StartPipelineService.new(job.pipeline).execute - new_job.reset - end + Ci::PipelineCreation::StartPipelineService.new(job.pipeline).execute + new_job.reset end end |