openstack/devstack-gate
Code Issues Proposed changes

Revert "update grenade branches"

Browse Source 
This reverts commit 1ab574df7c.

Grenade does not know how to upgrade from icehouse yet. This change
can only go in once grenade is aware of how to set up an "old" icehouse
install.

Partial-Bug: #1309324
Change-Id: I806850410a31e40aea81f3a57b48f3d98bef9dd2
This commit is contained in:
Clark Boylan
2014-04-17 20:48:21 -07:00
parent 28b039150d
commit 633b702cd9
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,7 @@ if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_NEW_BRANCH="stable/icehouse"
else # master
export GRENADE_OLD_BRANCH="stable/icehouse"
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_NEW_BRANCH="master"
fi
if [ "$DEVSTACK_GATE_GRENADE_PARTIAL_NCPU" -eq "1" ]; then
@@ -213,9 +213,6 @@ elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
export DEVSTACK_GATE_TEMPEST=1
if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_NEW_BRANCH="stable/icehouse"
elif [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
export GRENADE_OLD_BRANCH="stable/icehouse"
export GRENADE_NEW_BRANCH="master"
fi
fi