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

6 years ago · 35d2f793c1
parent 644f7c65c9 fef033b4cd
commit 35d2f793c1
1 changed files with 0 additions and 7 deletions
--- a/zuul/manager/init.py
+++ b/zuul/manager/init.py
@ -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):