Merge "Cancel a build even if not found"
This commit is contained in:
commit
20ed1a945e
|
@ -1112,6 +1112,7 @@ class TestScheduler(testtools.TestCase):
|
||||||
self.sched.result_event_queue.empty() and
|
self.sched.result_event_queue.empty() and
|
||||||
self.fake_gerrit.event_queue.empty() and
|
self.fake_gerrit.event_queue.empty() and
|
||||||
not self.merge_client.build_sets and
|
not self.merge_client.build_sets and
|
||||||
|
self.haveAllBuildsReported() and
|
||||||
self.areAllBuildsWaiting()):
|
self.areAllBuildsWaiting()):
|
||||||
self.sched.run_handler_lock.release()
|
self.sched.run_handler_lock.release()
|
||||||
self.worker.lock.release()
|
self.worker.lock.release()
|
||||||
|
|
|
@ -352,11 +352,11 @@ class Gearman(object):
|
||||||
self.log.debug("Still unable to find build %s to cancel" % build)
|
self.log.debug("Still unable to find build %s to cancel" % build)
|
||||||
if build.number:
|
if build.number:
|
||||||
self.log.debug("Build %s has just started" % build)
|
self.log.debug("Build %s has just started" % build)
|
||||||
self.cancelRunningBuild(build)
|
|
||||||
self.log.debug("Canceled just running build %s" % build)
|
|
||||||
else:
|
else:
|
||||||
self.log.error("Build %s has not started but "
|
self.log.error("Build %s has not started but was not"
|
||||||
"was not found in queue" % build)
|
"found in queue; canceling anyway" % build)
|
||||||
|
self.cancelRunningBuild(build)
|
||||||
|
self.log.debug("Canceled possibly running build %s" % build)
|
||||||
|
|
||||||
def onBuildCompleted(self, job, result=None):
|
def onBuildCompleted(self, job, result=None):
|
||||||
if job.unique in self.meta_jobs:
|
if job.unique in self.meta_jobs:
|
||||||
|
|
Loading…
Reference in New Issue