diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-27 07:56:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-27 07:56:58 +0000 |
| commit | 5da4f97e23a863d96761ce319c200392cb92e47a (patch) | |
| tree | 946c288349dc733eb056a2e7ad1171b11ce834fc /tests/yamlparser/fixtures | |
| parent | 8d489abece360c6e47658785327919eb3cb0c644 (diff) | |
| parent | 28cab53d5d78438949b1ca14b50d0ea99377eed9 (diff) | |
| download | python-jenkins-job-builder-5da4f97e23a863d96761ce319c200392cb92e47a.tar.gz python-jenkins-job-builder-5da4f97e23a863d96761ce319c200392cb92e47a.tar.xz python-jenkins-job-builder-5da4f97e23a863d96761ce319c200392cb92e47a.zip | |
Merge "Allow template-name in the global defaults"
Diffstat (limited to 'tests/yamlparser/fixtures')
| -rw-r--r-- | tests/yamlparser/fixtures/complete001.xml | 3 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/complete001.yaml | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/yamlparser/fixtures/complete001.xml b/tests/yamlparser/fixtures/complete001.xml index c34f622f..40fee172 100644 --- a/tests/yamlparser/fixtures/complete001.xml +++ b/tests/yamlparser/fixtures/complete001.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <project> <actions/> - <description><!-- Managed by Jenkins Job Builder --></description> + <description>JJB template: complete001_{version} +<!-- Managed by Jenkins Job Builder --></description> <keepDependencies>false</keepDependencies> <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> diff --git a/tests/yamlparser/fixtures/complete001.yaml b/tests/yamlparser/fixtures/complete001.yaml index 2a9ce7ec..f64b8084 100644 --- a/tests/yamlparser/fixtures/complete001.yaml +++ b/tests/yamlparser/fixtures/complete001.yaml @@ -1,3 +1,8 @@ +- defaults: + name: global + description: | + JJB template: {template-name} + - wrapper: name: timeout-wrapper wrappers: @@ -85,10 +90,11 @@ version: - 1.2 jobs: - - 'complete001_{version}' + - 'complete001' - job-template: name: 'complete001_{version}' + id: 'complete001' scm: - gerrit-scm: project_pattern: openstack-infra/jenkins-job-builder |