Merge "Fix nodeset return on skipped jobs" into feature/zuulv3
This commit is contained in:
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…
Reference in New Issue
Block a user