zuul
/
zuul
Code Issues Proposed changes

Have zuul re-run ABORTED jobs 

When we stop zuul-executors, we actually abort running jobs.  As a
result of this, we'd like said jobs to be scheduled again onto another
executor.

Change-Id: Ia03e8e69097642656768e70f9d537465180c99b9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-10-06 14:48:50 -04:00
parent 5e712e4bd1
commit 3202354dec
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/unit/test_scheduler.py
View File

@ -4596,6 +4596,30 @@ For CI problems and help debugging, contact ci@example.org"""
self.assertEqual(B.data['status'], 'MERGED')
self.assertEqual(B.reported, 2)
def test_job_aborted(self):
"Test that if a execute server aborts a job, it is run again"
self.executor_server.hold_jobs_in_build = True
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
self.waitUntilSettled()
self.executor_server.release('.*-merge')
self.waitUntilSettled()
self.assertEqual(len(self.builds), 2)
self.builds[0].aborted = True
self.executor_server.release('.*-test*')
self.waitUntilSettled()
self.assertEqual(len(self.builds), 1)
self.executor_server.hold_jobs_in_build = False
self.executor_server.release()
self.waitUntilSettled()
self.assertEqual(len(self.history), 4)
self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 1)
self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3)
def test_rerun_on_abort(self):
"Test that if a execute server fails to run a job, it is run again"

2
zuul/executor/client.py
View File

@ -367,7 +367,7 @@ class ExecutorClient(object):
if result is None:
result = data.get('result')
build.error_detail = data.get('error_detail')
if result is None:
if result is None or result == 'ABORTED':
if (build.build_set.getTries(build.job.name) >=
build.job.attempts):
result = 'RETRY_LIMIT'