diff options
| -rw-r--r-- | app/services/ci/register_job_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index e06f1c05843..2abc4a67dd6 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -36,7 +36,7 @@ module Ci builds = builds.with_any_tags end - builds.find do |build| + selection = builds.find do |build| next unless runner.can_pick?(build) begin @@ -45,7 +45,7 @@ module Ci if assign_runner!(build, params) register_success(build) - return Result.new(build, true) # rubocop:disable Cop/AvoidReturnFromBlocks + break build end rescue StateMachines::InvalidTransition, ActiveRecord::StaleObjectError # We are looping to find another build that is not conflicting @@ -61,6 +61,8 @@ module Ci end end + return Result.new(selection, true) if selection + register_failure Result.new(nil, valid) end |