From 2ed252fe3ee62e39a47c5f2154136e865ee2eb04 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 30 Sep 2015 07:08:02 -0400 Subject: [PATCH] update grenade branch logic for mitaka and put in a place holder for N so that cutting of stable mitaka doesn't trip up the same issue. Depends-On: I7173531028ab9b3921e2140c3e1e560040628801 grenade fixes Depends-On: I3eabae03483806602d7dea0e4ab737db4917d0fd nova aliases for liberty rpc pin (for partial upgrade) Depends-On: I306a9ddfb957a947915eecc2d3121a15909f54d3 increase timeout in waiting for services to stop Change-Id: Ie397f5bb5fffb73e8ab292b4c43f80c86fe7df94 --- devstack-vm-gate-wrap.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 2e58299f..2720b34e 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -267,6 +267,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then export GRENADE_NEW_BRANCH="stable/kilo" elif [[ "$GRENADE_BASE_BRANCH" == "stable/kilo" ]]; then export GRENADE_OLD_BRANCH="stable/kilo" + export GRENADE_NEW_BRANCH="stable/liberty" + elif [[ "$GRENADE_BASE_BRANCH" == "stable/liberty" ]]; then + export GRENADE_OLD_BRANCH="stable/liberty" export GRENADE_NEW_BRANCH="$GIT_BRANCH" fi ;; @@ -291,8 +294,16 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then elif [[ "$GRENADE_BASE_BRANCH" == "stable/kilo" ]]; then export GRENADE_OLD_BRANCH="stable/juno" export GRENADE_NEW_BRANCH="stable/kilo" - else # master + elif [[ "$GRENADE_BASE_BRANCH" == "stable/liberty" ]]; then export GRENADE_OLD_BRANCH="stable/kilo" + export GRENADE_NEW_BRANCH="stable/liberty" + elif [[ "$GRENADE_BASE_BRANCH" == "stable/mitaka" ]]; then + # not used yet, but will be used when we cut the + # stable mitaka branch + export GRENADE_OLD_BRANCH="stable/liberty" + export GRENADE_NEW_BRANCH="stable/mitaka" + else # master + export GRENADE_OLD_BRANCH="stable/liberty" export GRENADE_NEW_BRANCH="$GIT_BRANCH" fi ;;