diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 15:08:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 15:08:37 +0000 |
| commit | 37eff29d5ce44899e34c7c2ac319b314f2f26d15 (patch) | |
| tree | b74e1632fdb58ea10972f270bfec70a4e6ee07b0 /app/services/ci/process_pipeline_service.rb | |
| parent | 9411a664118a3247d0a56baf7e7ef4549c1201c3 (diff) | |
| download | gitlab-ce-37eff29d5ce44899e34c7c2ac319b314f2f26d15.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci/process_pipeline_service.rb')
| -rw-r--r-- | app/services/ci/process_pipeline_service.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/services/ci/process_pipeline_service.rb b/app/services/ci/process_pipeline_service.rb index 3a7d6ad9c3d..1ecef256233 100644 --- a/app/services/ci/process_pipeline_service.rb +++ b/app/services/ci/process_pipeline_service.rb @@ -11,9 +11,15 @@ module Ci def execute(trigger_build_ids = nil) update_retried - Ci::PipelineProcessing::LegacyProcessingService - .new(pipeline) - .execute(trigger_build_ids) + if Feature.enabled?(:ci_atomic_processing, pipeline.project) + Ci::PipelineProcessing::AtomicProcessingService + .new(pipeline) + .execute + else + Ci::PipelineProcessing::LegacyProcessingService + .new(pipeline) + .execute(trigger_build_ids) + end end private |