From 633b702cd9ac62d9fba15f60c20423844b4949b5 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 17 Apr 2014 20:48:21 -0700 Subject: [PATCH] Revert "update grenade branches" This reverts commit 1ab574df7c6b97dcc32f9b9191ff6bb5ac61e4e0. 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 --- devstack-vm-gate-wrap.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 37ce585d..94ccb8e5 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -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