zuul
/
zuul
Code Issues Proposed changes

Merge "Cancel a build even if not found"

This commit is contained in:
Jenkins 2014-03-11 16:02:27 +00:00 committed by Gerrit Code Review
parent d70e91c38a 9c2985a7e7
commit 20ed1a945e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/test_scheduler.py
View File

@ -1112,6 +1112,7 @@ class TestScheduler(testtools.TestCase):
self.sched.result_event_queue.empty() and
self.fake_gerrit.event_queue.empty() and
not self.merge_client.build_sets and
self.haveAllBuildsReported() and
self.areAllBuildsWaiting()):
self.sched.run_handler_lock.release()
self.worker.lock.release()

8
zuul/launcher/gearman.py
View File

@ -352,11 +352,11 @@ class Gearman(object):
self.log.debug("Still unable to find build %s to cancel" % build)
if build.number:
self.log.debug("Build %s has just started" % build)
self.cancelRunningBuild(build)
self.log.debug("Canceled just running build %s" % build)
else:
self.log.error("Build %s has not started but "
"was not found in queue" % build)
self.log.error("Build %s has not started but was not"
"found in queue; canceling anyway" % build)
self.cancelRunningBuild(build)
self.log.debug("Canceled possibly running build %s" % build)
def onBuildCompleted(self, job, result=None):
if job.unique in self.meta_jobs: