zuul
/
zuul
Code Issues Proposed changes

Merge "Abort reconfiguration when cat jobs fail" into feature/zuulv3

This commit is contained in:
Zuul 2017-09-12 16:06:50 +00:00 committed by Gerrit Code Review
parent d7be540ab8 3b5b335ca2
commit 9bcbd6d731
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/configloader.py
View File

@ -1342,6 +1342,8 @@ class TenantParser(object):
continue
TenantParser.log.debug("Waiting for cat job %s" % (job,))
job.wait()
if not job.updated:
raise Exception("Cat job %s failed" % (job,))
TenantParser.log.debug("Cat job %s got files %s" %
(job, job.files))
loaded = False

6
zuul/merger/client.py
View File

@ -134,18 +134,18 @@ class MergeClient(object):
def onBuildCompleted(self, job):
data = getJobData(job)
merged = data.get('merged', False)
updated = data.get('updated', False)
job.updated = data.get('updated', False)
commit = data.get('commit')
files = data.get('files', {})
repo_state = data.get('repo_state', {})
job.files = files
self.log.info("Merge %s complete, merged: %s, updated: %s, "
"commit: %s" %
(job, merged, updated, commit))
(job, merged, job.updated, commit))
job.setComplete()
if job.build_set:
self.sched.onMergeCompleted(job.build_set,
merged, updated, commit, files,
merged, job.updated, commit, files,
repo_state)
# The test suite expects the job to be removed from the
# internal account after the wake flag is set.