Merge "Avoid multiple build cancelations" into feature/zuulv3

This commit is contained in:
Jenkins 2017-02-06 13:34:57 +00:00 committed by Gerrit Code Review
commit 644f7c65c9
1 changed files with 3 additions and 0 deletions

View File

@ -400,6 +400,9 @@ class PipelineManager(object):
old_build_set.node_requests = {} old_build_set.node_requests = {}
canceled_jobs = set() canceled_jobs = set()
for build in old_build_set.getBuilds(): for build in old_build_set.getBuilds():
if build.result:
canceled_jobs.add(build.job.name)
continue
was_running = False was_running = False
try: try:
was_running = self.sched.launcher.cancel(build) was_running = self.sched.launcher.cancel(build)