diff options
author | Zuul <zuul@review.openstack.org> | 2017-10-27 19:33:11 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-10-27 19:33:11 +0000 |
commit | 22590cb8da6797748797517833e47a35ce7b0825 (patch) | |
tree | b6f2ae7070db84c72f176fa8e1e297e3ce160fbc /tests/fixtures | |
parent | fa7b6b04598518da4001b943f324aa5d05b1452b (diff) | |
parent | c32a83538a1a3464ecb398068531b471ee380a07 (diff) | |
download | zuul-22590cb8da6797748797517833e47a35ce7b0825.tar.gz |
Merge "Switch to late-binding inheritance" into feature/zuulv3
Diffstat (limited to 'tests/fixtures')
4 files changed, 93 insertions, 0 deletions
diff --git a/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml b/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml index 89d98a982..161e5a1fb 100644 --- a/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml +++ b/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml @@ -11,6 +11,26 @@ gerrit: Verified: -1 +- pipeline: + name: gate + manager: dependent + trigger: + gerrit: + - event: comment-added + approval: + - Approved: 1 + success: + gerrit: + Verified: 2 + submit: true + failure: + gerrit: + Verified: -2 + start: + gerrit: + Verified: 0 + precedence: high + - job: name: base parent: null @@ -23,3 +43,14 @@ name: project-config check: jobs: [] + gate: + jobs: + - noop + +- project: + name: puppet-integration + check: + jobs: [] + gate: + jobs: + - noop diff --git a/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml b/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml index 25452089f..322927f94 100644 --- a/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml +++ b/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml @@ -11,6 +11,8 @@ name: puppet-lint parent: puppet-module-base run: playbooks/run-lint + tags: + - master - project-template: name: puppet-check-jobs diff --git a/tests/fixtures/config/branch-variants/git/puppet-integration/stable.zuul.yaml b/tests/fixtures/config/branch-variants/git/puppet-integration/stable.zuul.yaml new file mode 100644 index 000000000..4701b80c2 --- /dev/null +++ b/tests/fixtures/config/branch-variants/git/puppet-integration/stable.zuul.yaml @@ -0,0 +1,26 @@ +- job: + name: puppet-base + pre-run: playbooks/prepare-node-common + +- job: + name: puppet-module-base + parent: puppet-base + pre-run: playbooks/prepare-node-unit + +- job: + name: puppet-lint + parent: puppet-module-base + run: playbooks/run-lint + tags: + - stable + +- project-template: + name: puppet-check-jobs + check: + jobs: + - puppet-lint + +- project: + name: puppet-integration + templates: + - puppet-check-jobs diff --git a/tests/fixtures/layouts/parent-matchers.yaml b/tests/fixtures/layouts/parent-matchers.yaml new file mode 100644 index 000000000..d53741e63 --- /dev/null +++ b/tests/fixtures/layouts/parent-matchers.yaml @@ -0,0 +1,34 @@ +- pipeline: + name: check + manager: independent + trigger: + gerrit: + - event: patchset-created + success: + gerrit: + Verified: 1 + failure: + gerrit: + Verified: -1 + +- job: + name: base + parent: null + +- job: + name: parent-job + files: foo.txt + +- job: + name: parent-job + files: bar.txt + +- job: + name: child-job + parent: parent-job + +- project: + name: org/project + check: + jobs: + - child-job |