zuul/zuul
Code Issues Proposed changes

Merge "Fix source context in split config"

Browse Source
This commit is contained in:
Zuul
2018-07-05 21:44:45 +00:00
committed by Gerrit Code Review
parent f4f74b66b7 ed792c9a2e
commit 3683dccdad
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/fixtures/config/split-config/git/common-config/zuul.d/more-jobs.yaml vendored Normal file
View File

@@ -0,0 +1,3 @@
- job:
name: project-test2
run: playbooks/project-test1.yaml

16
tests/unit/test_configloader.py
View File

@@ -309,6 +309,22 @@ class TestSplitConfig(ZuulTestCase):
def test_split_config(self):
tenant = self.sched.abide.tenants.get('tenant-one')
self.assertIn('project-test1', tenant.layout.jobs)
self.assertIn('project-test2', tenant.layout.jobs)
test1 = tenant.layout.getJob('project-test1')
self.assertEqual(test1.source_context.project.name, 'common-config')
self.assertEqual(test1.source_context.branch, 'master')
self.assertEqual(test1.source_context.path, 'zuul.d/jobs.yaml')
self.assertEqual(test1.source_context.trusted, True)
test2 = tenant.layout.getJob('project-test2')
self.assertEqual(test2.source_context.project.name, 'common-config')
self.assertEqual(test2.source_context.branch, 'master')
self.assertEqual(test2.source_context.path, 'zuul.d/more-jobs.yaml')
self.assertEqual(test2.source_context.trusted, True)
self.assertNotEqual(test1.source_context, test2.source_context)
self.assertTrue(test1.source_context.isSameProject(
test2.source_context))
project_config = tenant.layout.project_configs.get(
'review.example.com/org/project')
self.assertIn('project-test1',

3
zuul/configloader.py
View File

@@ -1526,7 +1526,8 @@ class TenantParser(object):
(job.source_context,))
continue
loaded = conf_root
source_context = job.source_context
# Create a new source_context so we have unique filenames.
source_context = job.source_context.copy()
source_context.path = fn
self.log.info(
"Loading configuration from %s" %