From 1ab574df7c6b97dcc32f9b9191ff6bb5ac61e4e0 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 17 Apr 2014 15:51:13 -0400 Subject: [PATCH] update grenade branches make it possible to run grenade from stable/icehouse -> master Change-Id: If46d1624e0b35a37d5dfb043edb513fc04b6ea68 --- 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 94ccb8e5..37ce585d 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