zuul/zuul
Code Issues Proposed changes

Reload config on extra config files changes

Browse Source 
The change to add extra-config-paths neclected to update the updatesConfig()
method to account for the potential new paths; this could Zuul to fail to
reload its configuration on changes which touched only the extra files.

This corrects that and adds a test case.

Change-Id: I79fa02a482a0bbebff0de7f3081bb7ed04f1214c
This commit is contained in:
James E. Blair
2019-07-01 11:57:36 -07:00
parent eed9931d4c
commit c5090244dc
7 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zuul/manager/__init__.py
View File

@@ -598,7 +598,7 @@ class PipelineManager(object):
def _queueUpdatesConfig(self, item):
while item:
if item.change.updatesConfig():
if item.change.updatesConfig(item.pipeline.tenant):
return True
item = item.item_ahead
return False
@@ -607,7 +607,7 @@ class PipelineManager(object):
if not self._queueUpdatesConfig(item):
# No config updates in queue. Use existing pipeline layout
return item.queue.pipeline.tenant.layout
elif (not item.change.updatesConfig() and
elif (not item.change.updatesConfig(item.pipeline.tenant) and
item.item_ahead and item.item_ahead.live):
# Current change does not update layout, use its parent if parent
# has a layout.