From a146a270ccb9182d58ad9b77216bd6ddf107d6f1 Mon Sep 17 00:00:00 2001
From: Sean Dague <sdague@linux.vnet.ibm.com>
Date: Tue, 29 Oct 2013 20:59:36 -0400
Subject: [PATCH] Only zuulify the tree if we are on the right branch

We need to be more careful in our selection of when we zuulify the
tree, because we now want to zuulify the "old" tree as well. But
only do that if the ZUUL_BRANCH matches the $branch we've told it
to setup the workspace for.

Change-Id: Ie0ef097949aa54cb720615df80ed3aba4c16cc30
---
 devstack-vm-gate-wrap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ; } || \