Merge branch 'sh-register-ci-job-service-improve' into 'master'
Clean up fix for RegisterJobService See merge request gitlab-org/gitlab-ce!23315
This commit is contained in:
commit
6b9ecc8f97
|
@ -36,7 +36,7 @@ module Ci
|
|||
builds = builds.with_any_tags
|
||||
end
|
||||
|
||||
selection = builds.find do |build|
|
||||
builds.each do |build|
|
||||
next unless runner.can_pick?(build)
|
||||
|
||||
begin
|
||||
|
@ -45,7 +45,7 @@ module Ci
|
|||
if assign_runner!(build, params)
|
||||
register_success(build)
|
||||
|
||||
break build
|
||||
return Result.new(build, true)
|
||||
end
|
||||
rescue StateMachines::InvalidTransition, ActiveRecord::StaleObjectError
|
||||
# We are looping to find another build that is not conflicting
|
||||
|
@ -61,8 +61,6 @@ module Ci
|
|||
end
|
||||
end
|
||||
|
||||
return Result.new(selection, true) if selection
|
||||
|
||||
register_failure
|
||||
Result.new(nil, valid)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue