From bc9c5d5b4c2e9d004b620a6d9bd4add59e22d9a8 Mon Sep 17 00:00:00 2001
From: ghanshyam <gmann@ghanshyammann.com>
Date: Tue, 14 Aug 2018 09:18:53 +0000
Subject: [PATCH] Update grenade settings for stable/rocky

Depends-On: https://review.openstack.org/600196/

Change-Id: I940a705d4b8269fbf3bec9f107f179e9191b5a42
---
 devstack-vm-gate-wrap.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 42bfb555..27e12d55 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -313,6 +313,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
                 export GRENADE_NEW_BRANCH="stable/queens"
             elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
                 export GRENADE_OLD_BRANCH="stable/queens"
+                export GRENADE_NEW_BRANCH="stable/rocky"
+            elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
+                export GRENADE_OLD_BRANCH="stable/rocky"
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
             fi
             ;;
@@ -338,8 +341,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
             elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
                 export GRENADE_OLD_BRANCH="stable/pike"
                 export GRENADE_NEW_BRANCH="stable/queens"
-            else # master
+            elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
                 export GRENADE_OLD_BRANCH="stable/queens"
+                export GRENADE_NEW_BRANCH="stable/rocky"
+            else # master
+                export GRENADE_OLD_BRANCH="stable/rocky"
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
             fi
             ;;