diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-18 17:56:54 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-18 17:56:54 +0000 |
| commit | 08ee1e29f9beef1109930dedc74d3de3518b693b (patch) | |
| tree | 2843e92029934f56225090bda553dea21d5d3243 | |
| parent | 3fdc656032680494153f9e75332a275d3784752d (diff) | |
| parent | 53381a962d5fef78ae3edbfa9a0d6f9ba3f7187b (diff) | |
| download | gitlab-ce-08ee1e29f9beef1109930dedc74d3de3518b693b.tar.gz | |
Merge branch 'use-queue_namespace' into 'master'
Use queue_namespace rather than enqueue_in
See merge request gitlab-org/gitlab-ce!15989
| -rw-r--r-- | app/workers/all_queues.yml | 1 | ||||
| -rw-r--r-- | app/workers/run_pipeline_schedule_worker.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index ba31a5aa9c2..268b7028fd9 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -39,6 +39,7 @@ - pipeline_cache:expire_job_cache - pipeline_cache:expire_pipeline_cache - pipeline_creation:create_pipeline +- pipeline_creation:run_pipeline_schedule - pipeline_default:build_coverage - pipeline_default:build_trace_sections - pipeline_default:pipeline_metrics diff --git a/app/workers/run_pipeline_schedule_worker.rb b/app/workers/run_pipeline_schedule_worker.rb index 7725ad319a3..8f5138fc873 100644 --- a/app/workers/run_pipeline_schedule_worker.rb +++ b/app/workers/run_pipeline_schedule_worker.rb @@ -2,7 +2,7 @@ class RunPipelineScheduleWorker include ApplicationWorker include PipelineQueue - enqueue_in group: :creation + queue_namespace :pipeline_creation def perform(schedule_id, user_id) schedule = Ci::PipelineSchedule.find_by(id: schedule_id) |