From 45b52f96a3d349d7d5c21fe61c6844a0e07b5622 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 24 Apr 2014 06:06:42 -0400 Subject: [PATCH] Revert "Revert "update grenade branches"" We are not gating on n-cpu-partial so it's safe to propose icehouse -> master grenade upgrades. This reverts commit 633b702cd9ac62d9fba15f60c20423844b4949b5. Change-Id: If6f18f86f0f5a2dccd02fb82452c8651436cc5d2 --- devstack-vm-gate-wrap.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index a8b3b837..d79d5c84 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/havana" + export GRENADE_OLD_BRANCH="stable/icehouse" export GRENADE_NEW_BRANCH="master" fi if [ "$DEVSTACK_GATE_GRENADE_PARTIAL_NCPU" -eq "1" ]; then @@ -213,6 +213,9 @@ 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