openstack/devstack-gate
Code Issues Proposed changes

Only zuulify the tree if we are on the right branch

Browse Source 
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
This commit is contained in:
Sean Dague
2013-10-29 20:59:36 -04:00
parent 40ecc36f5f
commit a146a270cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devstack-vm-gate-wrap.sh
View File

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