Merge "Fix nodeset return on skipped jobs" into feature/zuulv3

changes/46/427946/9
Jenkins 6 years ago committed by Gerrit Code Review
commit 35d2f793c1

@ -624,13 +624,6 @@ class PipelineManager(object):
if build.retry:
build.build_set.removeJobNodeSet(build.job.name)
# If any jobs were skipped as a result of this build, return
# their nodes.
for build in build.build_set.getBuilds():
if build.result == 'SKIPPED':
nodeset = build.build_set.getJobNodeSet(build.job.name)
self.sched.nodepool.returnNodeSet(nodeset)
return True
def onMergeCompleted(self, event):

Loading…
Cancel
Save