diff options
| author | Sam Betts <sam@code-smash.net> | 2018-02-02 16:07:55 +0000 |
|---|---|---|
| committer | Sam Betts <sam@code-smash.net> | 2018-02-05 17:04:52 +0000 |
| commit | 7bc7eadecd064e6cf3f825414e9eb537e4c05296 (patch) | |
| tree | e4bcfa94b3b55d02f910a59edf969c4f47b062cb /playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml | |
| parent | 301fde55d150d2264cb39667cafbb02b2e811370 (diff) | |
| download | ironic-7bc7eadecd064e6cf3f825414e9eb537e4c05296.tar.gz | |
Use zuul.override_checkout instead of custom branch_override var
To override the branch correctly in both zuulv3's playbook loading we
have to use override_checkout in the job. This variable already gives us
the information we need to set the override branch, so use that instead
of the custom branch_override variable so we don't have to define it
twice in the job.
Change-Id: Iec7be918f75e3400197748385b287fb945d761ac
(cherry picked from commit dcc5546b49ad7a791a00284999e6db4a802792b1)
Diffstat (limited to 'playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml')
| -rw-r--r-- | playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml index 4d67c8cc9..976571599 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml @@ -105,7 +105,7 @@ export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_CONFIGDRIVE=1 export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool - export BRANCH_OVERRIDE=default + export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi |