Support zuul's standard override-checkout variable

Similar change to ironic's dcc5546b49ad7a791a00284999e6db4a802792b1.
Allows using inspector's jobs in the ironic-tempest-plugin gate.

Change-Id: I69d91ac4b00dabfd917f097d70f0b38e0a4fc4c6
This commit is contained in:
Dmitry Tantsur 2018-03-28 12:29:25 +02:00
parent 586f889874
commit 1fc3bfa6d2
3 changed files with 6 additions and 3 deletions

View File

@ -141,7 +141,8 @@
# TODO(dtantsur): change to ipmi in Rocky
export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=iscsi"
export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi

View File

@ -117,7 +117,8 @@
export DEVSTACK_GATE_CONFIGDRIVE=1
export DEVSTACK_GATE_IRONIC_DRIVER=ipmi
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct"
export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi

View File

@ -98,7 +98,8 @@
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_VIRT_DRIVER=ironic
export DEVSTACK_GATE_CONFIGDRIVE=1
export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi