Merge "Support zuul's standard override-checkout variable"
This commit is contained in:
commit
8db7ef7bf1
|
@ -141,7 +141,8 @@
|
||||||
# TODO(dtantsur): change to ipmi in Rocky
|
# TODO(dtantsur): change to ipmi in Rocky
|
||||||
export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
|
export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=iscsi"
|
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
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -117,7 +117,8 @@
|
||||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
export DEVSTACK_GATE_CONFIGDRIVE=1
|
||||||
export DEVSTACK_GATE_IRONIC_DRIVER=ipmi
|
export DEVSTACK_GATE_IRONIC_DRIVER=ipmi
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct"
|
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
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -98,7 +98,8 @@
|
||||||
export DEVSTACK_GATE_NEUTRON=1
|
export DEVSTACK_GATE_NEUTRON=1
|
||||||
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
export DEVSTACK_GATE_VIRT_DRIVER=ironic
|
||||||
export DEVSTACK_GATE_CONFIGDRIVE=1
|
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
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue