Ignore builds once they have been canceled
This change causes the gearman launcher to completely ignore builds
after the stop job request has been sent. This should prevent
them from updating build status with confusing results. It will
also help us avoid restarting canceled builds in a subsequent
change.
Change-Id: Id31bcbfb6f24a7ec9f5f0a776d7d2c30f36685b4
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 48baaef..6ae714b 100644
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -1305,6 +1305,73 @@
self.assertEqual(B.reported, 2)
self.assertEqual(C.reported, 2)
+ def test_failed_change_in_middle(self):
+ "Test a failed change in the middle of the queue"
+
+ self.worker.hold_jobs_in_build = True
+ A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
+ B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
+ C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
+ A.addApproval('CRVW', 2)
+ B.addApproval('CRVW', 2)
+ C.addApproval('CRVW', 2)
+
+ self.worker.addFailTest('project-test1', B)
+
+ self.fake_gerrit.addEvent(A.addApproval('APRV', 1))
+ self.fake_gerrit.addEvent(B.addApproval('APRV', 1))
+ self.fake_gerrit.addEvent(C.addApproval('APRV', 1))
+
+ self.waitUntilSettled()
+
+ self.worker.release('.*-merge')
+ self.waitUntilSettled()
+ self.worker.release('.*-merge')
+ self.waitUntilSettled()
+ self.worker.release('.*-merge')
+ self.waitUntilSettled()
+
+ self.assertEqual(len(self.builds), 6)
+ self.assertEqual(self.builds[0].name, 'project-test1')
+ self.assertEqual(self.builds[1].name, 'project-test2')
+ self.assertEqual(self.builds[2].name, 'project-test1')
+ self.assertEqual(self.builds[3].name, 'project-test2')
+ self.assertEqual(self.builds[4].name, 'project-test1')
+ self.assertEqual(self.builds[5].name, 'project-test2')
+
+ self.release(self.builds[2])
+ self.waitUntilSettled()
+
+ # project-test1 and project-test2 for A, project-test2 for B
+ self.assertEqual(len(self.builds), 3)
+ self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 2)
+
+ # check that build status of aborted jobs are masked ('CANCELED')
+ items = self.sched.layout.pipelines['gate'].getAllItems()
+ builds = items[0].current_build_set.getBuilds()
+ self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
+ self.assertEqual(self.countJobResults(builds, None), 2)
+ builds = items[1].current_build_set.getBuilds()
+ self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
+ self.assertEqual(self.countJobResults(builds, 'FAILURE'), 1)
+ self.assertEqual(self.countJobResults(builds, None), 1)
+ builds = items[2].current_build_set.getBuilds()
+ self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
+ self.assertEqual(self.countJobResults(builds, 'CANCELED'), 2)
+
+ self.worker.hold_jobs_in_build = False
+ self.worker.release()
+ self.waitUntilSettled()
+
+ self.assertEqual(len(self.builds), 0)
+ self.assertEqual(len(self.history), 12)
+ self.assertEqual(A.data['status'], 'MERGED')
+ self.assertEqual(B.data['status'], 'NEW')
+ self.assertEqual(C.data['status'], 'MERGED')
+ self.assertEqual(A.reported, 2)
+ self.assertEqual(B.reported, 2)
+ self.assertEqual(C.reported, 2)
+
def test_failed_change_at_head_with_queue(self):
"Test that if a change at the head fails, queued jobs are canceled"
diff --git a/zuul/launcher/gearman.py b/zuul/launcher/gearman.py
index 62683f4..763a8bd 100644
--- a/zuul/launcher/gearman.py
+++ b/zuul/launcher/gearman.py
@@ -324,6 +324,7 @@
def cancel(self, build):
self.log.info("Cancel build %s for job %s" % (build, build.job))
+ build.canceled = True
if build.number is not None:
self.log.debug("Build %s has already started" % build)
self.cancelRunningBuild(build)
@@ -353,15 +354,16 @@
build = self.builds.get(job.unique)
if build:
- if result is None:
- data = getJobData(job)
- result = data.get('result')
- if result is None:
- result = 'LOST'
- self.log.info("Build %s complete, result %s" %
- (job, result))
- build.result = result
- self.sched.onBuildCompleted(build)
+ if not build.canceled:
+ if result is None:
+ data = getJobData(job)
+ result = data.get('result')
+ if result is None:
+ result = 'LOST'
+ self.log.info("Build %s complete, result %s" %
+ (job, result))
+ build.result = result
+ self.sched.onBuildCompleted(build)
# The test suite expects the build to be removed from the
# internal dict after it's added to the report queue.
del self.builds[job.unique]
diff --git a/zuul/model.py b/zuul/model.py
index 7fb81bc..5ee0554 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -536,6 +536,7 @@
self.end_time = None
self.estimated_time = None
self.pipeline = None
+ self.canceled = False
self.parameters = {}
def __repr__(self):