diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index a121f092..2019bf27 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -130,7 +130,8 @@ function setup_workspace { # See if we should check out a Zuul ref if [ $CHECKOUT_ZUUL -eq "1" ]; then # See if Zuul prepared a ref for this project - if { [ "$OVERRIDE_ZUUL_REF" != "" ] && \ + if { [ "$ZUUL_BRANCH" == "$branch" ] && \ + [ "$OVERRIDE_ZUUL_REF" != "" ] && \ git fetch $ZUUL_URL/$PROJECT $OVERRIDE_ZUUL_REF ; } || \ { [ "$ZUUL_REF" != "" ] && \ git fetch $ZUUL_URL/$PROJECT $ZUUL_REF ; } || \