diff options
author | Sean McGivern <sean@gitlab.com> | 2019-08-05 09:29:45 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-08-05 09:29:45 +0000 |
commit | d126df55fde21d2dc8eb9d5f72841a9792bca105 (patch) | |
tree | 0fa922bf6061df566b99141933c3774b85be27a9 /app/workers | |
parent | fccbe0f97a76ba85daf745b4dd98375a5cd8f03f (diff) | |
parent | 593490e5ac6ec5a92fdcc9b82eebbb455ea6cf48 (diff) | |
download | gitlab-ce-d126df55fde21d2dc8eb9d5f72841a9792bca105.tar.gz |
Merge branch 'prefer-to-use-process-pipeline-worker' into 'master'
Extend PipelineProcessWorker to accept a list of builds
See merge request gitlab-org/gitlab-ce!31425
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/build_process_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/pipeline_process_worker.rb | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/workers/build_process_worker.rb b/app/workers/build_process_worker.rb index 19e590ee1d7..9cd9519df1f 100644 --- a/app/workers/build_process_worker.rb +++ b/app/workers/build_process_worker.rb @@ -9,7 +9,7 @@ class BuildProcessWorker # rubocop: disable CodeReuse/ActiveRecord def perform(build_id) CommitStatus.find_by(id: build_id).try do |build| - build.pipeline.process!(build.name) + build.pipeline.process!([build_id]) end end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/workers/pipeline_process_worker.rb b/app/workers/pipeline_process_worker.rb index f2aa17acb51..96524d93f8d 100644 --- a/app/workers/pipeline_process_worker.rb +++ b/app/workers/pipeline_process_worker.rb @@ -7,9 +7,10 @@ class PipelineProcessWorker queue_namespace :pipeline_processing # rubocop: disable CodeReuse/ActiveRecord - def perform(pipeline_id) - Ci::Pipeline.find_by(id: pipeline_id) - .try(:process!) + def perform(pipeline_id, build_ids = nil) + Ci::Pipeline.find_by(id: pipeline_id).try do |pipeline| + pipeline.process!(build_ids) + end end # rubocop: enable CodeReuse/ActiveRecord end |