diff options
| author | James E. Blair <jeblair@redhat.com> | 2017-10-30 14:04:48 -0700 |
|---|---|---|
| committer | James E. Blair <jeblair@redhat.com> | 2017-10-30 15:00:11 -0700 |
| commit | edff2c26c2b411316b0cf32bc635277f3ce811ca (patch) | |
| tree | 97c667fb963f862923b3b64e26a7fc5402d2b59b /tests/fixtures | |
| parent | c317fba760f9873792d2427a8d20da0ca327bffb (diff) | |
| download | zuul-edff2c26c2b411316b0cf32bc635277f3ce811ca.tar.gz | |
Add support for override-checkout, deprecate override-branch
We want to support jobs specifying that they check out a tag
rather than merely a branch. This accidentally worked in Zuul v2
with zuul-cloner, and some jobs have come to rely on the behavior.
There's no reason not to support it, so let's do so.
However, for clarity, change the name of the option to
"override-checkout". This is intended to be intuitive (anything
you can tell git to 'checkout' you can put here), while avoiding
the suggestion that only branches or tags may be checked out.
The old form, "override-branch" is deprecated and will be removed.
Change-Id: Icc2907e72596626e96d2dc9f6ab1c3026f4085ab
Diffstat (limited to 'tests/fixtures')
5 files changed, 40 insertions, 4 deletions
diff --git a/tests/fixtures/layouts/repo-checkout-no-timer-override.yaml b/tests/fixtures/layouts/repo-checkout-no-timer-override.yaml index ca4929205..89d2b93e2 100644 --- a/tests/fixtures/layouts/repo-checkout-no-timer-override.yaml +++ b/tests/fixtures/layouts/repo-checkout-no-timer-override.yaml @@ -15,7 +15,7 @@ - job: name: integration branches: master - override-branch: stable/havana + override-checkout: stable/havana required-projects: - org/project1 run: playbooks/integration.yaml diff --git a/tests/fixtures/layouts/repo-checkout-no-timer.yaml b/tests/fixtures/layouts/repo-checkout-no-timer.yaml index 6b8880116..037489739 100644 --- a/tests/fixtures/layouts/repo-checkout-no-timer.yaml +++ b/tests/fixtures/layouts/repo-checkout-no-timer.yaml @@ -14,7 +14,7 @@ - job: name: integration - override-branch: stable/havana + override-checkout: stable/havana required-projects: - org/project1 run: playbooks/integration.yaml diff --git a/tests/fixtures/layouts/repo-checkout-six-project.yaml b/tests/fixtures/layouts/repo-checkout-six-project.yaml index 607961269..48786654b 100644 --- a/tests/fixtures/layouts/repo-checkout-six-project.yaml +++ b/tests/fixtures/layouts/repo-checkout-six-project.yaml @@ -44,7 +44,7 @@ - org/project2 - org/project3 - name: org/project4 - override-branch: master + override-checkout: master - org/project5 - org/project6 run: playbooks/integration.yaml diff --git a/tests/fixtures/layouts/repo-checkout-tag.yaml b/tests/fixtures/layouts/repo-checkout-tag.yaml new file mode 100644 index 000000000..3f1af1ceb --- /dev/null +++ b/tests/fixtures/layouts/repo-checkout-tag.yaml @@ -0,0 +1,36 @@ +- 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: integration + required-projects: + - org/project1 + - name: org/project2 + override-checkout: test-tag + run: playbooks/integration.yaml + +- project: + name: org/project1 + check: + jobs: + - integration + +- project: + name: org/project2 + check: + jobs: + - integration diff --git a/tests/fixtures/layouts/repo-checkout-timer-override.yaml b/tests/fixtures/layouts/repo-checkout-timer-override.yaml index af5bd3c45..4aacfee53 100644 --- a/tests/fixtures/layouts/repo-checkout-timer-override.yaml +++ b/tests/fixtures/layouts/repo-checkout-timer-override.yaml @@ -13,7 +13,7 @@ - job: name: integration branches: master - override-branch: stable/havana + override-checkout: stable/havana required-projects: - org/project1 run: playbooks/integration.yaml |