diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/runner.rb | 8 | ||||
| -rw-r--r-- | app/services/ci/update_build_queue_service.rb | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 6e58a1878c8..ed1843ba005 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -126,9 +126,11 @@ module Ci end def tick_runner_queue - new_update = SecureRandom.hex - Gitlab::Redis.with { |redis| redis.set(runner_queue_key, new_update, ex: RUNNER_QUEUE_EXPIRY_TIME) } - new_update + SecureRandom.hex.tap do |new_update| + Gitlab::Redis.with do |redis| + redis.set(runner_queue_key, new_update, ex: RUNNER_QUEUE_EXPIRY_TIME) + end + end end def ensure_runner_queue_value diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb index 2e901016666..152c8ae5006 100644 --- a/app/services/ci/update_build_queue_service.rb +++ b/app/services/ci/update_build_queue_service.rb @@ -6,6 +6,14 @@ module Ci runner.tick_runner_queue end end + + return unless build.project.shared_runners_enabled? + + Ci::Runner.shared.each do |runner| + if runner.can_pick?(build) + runner.tick_runner_queue + end + end end end end |