diff --git a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml index 04ad2f4ef..155425464 100644 --- a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml +++ b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml @@ -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 diff --git a/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml b/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml index 81046e122..a3ec10727 100644 --- a/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml +++ b/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml @@ -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 diff --git a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml index 6c64fc0d0..6ed86ca05 100644 --- a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml +++ b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml @@ -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