zuul
/
zuul
Code Issues Proposed changes

Read layout from BuildSet in first merge scenario 

When you are running the first test of a project then the layout doesn't
contain the project and so can't report. It seems like this used to be
able to be pulled from the QueueItem.layout but this doesn't seem to be
set any more. If we get it from the BuildSet this works so we should
allow it to be sourced from there.

Change-Id: Icf972d1c5eb351e7800c05064f94b86513df660b
Signed-off-by: Jamie Lennox <jamielennox@gmail.com>
This commit is contained in:
Jamie Lennox 2017-06-14 15:24:52 +10:00
parent 96e6589cce
commit f6c57effb7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zuul/manager/__init__.py
View File

@ -738,7 +738,9 @@ class PipelineManager(object):
# pipeline, use the dynamic layout if available, otherwise,
# fall back to the current static layout as a best
# approximation.
layout = item.layout or self.pipeline.layout
layout = (item.layout or
item.current_build_set.layout or
self.pipeline.layout)
if not layout.hasProject(item.change.project):
self.log.debug("Project %s not in pipeline %s for change %s" % (