zuul/zuul
Code Issues Proposed changes

Support custom playbook locations

Browse Source 
This change drops the playbooks/ location for pre and post playbooks
in any case and for main playbooks if the run argument is given.

That way the playbooks can be placed in arbitrary locations giving the
projects more flexibility how to structure their repo.

Change-Id: I84d42f9b293df716a7a0759c7127b6f705c075c2
This commit is contained in:
Tobias Henkel
2017-06-26 22:53:45 +02:00
parent a7cf5c518a
commit 165450e760
3 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/unit/test_model.py
View File

@@ -266,11 +266,11 @@ class TestJob(BaseTestCase):
self.assertEqual(len(nodes), 1)
self.assertEqual(nodes[0].label, 'new')
self.assertEqual([x.path for x in job.pre_run],
['playbooks/base-pre',
'playbooks/py27-pre'])
['base-pre',
'py27-pre'])
self.assertEqual([x.path for x in job.post_run],
['playbooks/py27-post',
'playbooks/base-post'])
['py27-post',
'base-post'])
self.assertEqual([x.path for x in job.run],
['playbooks/python27',
'playbooks/base'])
@@ -294,15 +294,15 @@ class TestJob(BaseTestCase):
self.assertEqual(len(nodes), 1)
self.assertEqual(nodes[0].label, 'old')
self.assertEqual([x.path for x in job.pre_run],
['playbooks/base-pre',
'playbooks/py27-pre',
'playbooks/py27-diablo-pre'])
['base-pre',
'py27-pre',
'py27-diablo-pre'])
self.assertEqual([x.path for x in job.post_run],
['playbooks/py27-diablo-post',
'playbooks/py27-post',
'playbooks/base-post'])
['py27-diablo-post',
'py27-post',
'base-post'])
self.assertEqual([x.path for x in job.run],
['playbooks/py27-diablo']),
['py27-diablo']),
# Test essex
change.branch = 'stable/essex'
@@ -319,13 +319,13 @@ class TestJob(BaseTestCase):
job = item.getJobs()[0]
self.assertEqual(job.name, 'python27')
self.assertEqual([x.path for x in job.pre_run],
['playbooks/base-pre',
'playbooks/py27-pre',
'playbooks/py27-essex-pre'])
['base-pre',
'py27-pre',
'py27-essex-pre'])
self.assertEqual([x.path for x in job.post_run],
['playbooks/py27-essex-post',
'playbooks/py27-post',
'playbooks/base-post'])
['py27-essex-post',
'py27-post',
'base-post'])
self.assertEqual([x.path for x in job.run],
['playbooks/python27',
'playbooks/base'])