Adjust grenade branches for mitaka

This makes grenade work with stable mitaka, both upgrading to it, and upgrading from it in master. Depends-On: Ic9fc5cde67691ce03b3d612d86da7207608e20b1 grenade fixes for OS_PROJECT_NAME Change-Id: I73d2f7f83f700e430d231235e6d2277100036cd5
openstack · Mar 24, 2016 · be06eea · be06eea
1 parent 589ca4f
commit be06eea
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
@@ -269,6 +269,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
                 export GRENADE_NEW_BRANCH="stable/liberty"
             elif [[ "$GRENADE_BASE_BRANCH" == "stable/liberty" ]]; then
                 export GRENADE_OLD_BRANCH="stable/liberty"
+                export GRENADE_NEW_BRANCH="stable/mitaka"
+            elif [[ "$GRENADE_BASE_BRANCH" == "stable/mitaka" ]]; then
+                export GRENADE_OLD_BRANCH="stable/mitaka"
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
             fi
             ;;
@@ -296,8 +299,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
             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
+                export GRENADE_OLD_BRANCH="stable/kilo"
+                export GRENADE_NEW_BRANCH="stable/mitaka"
             else # master
-                export GRENADE_OLD_BRANCH="stable/liberty"
+                export GRENADE_OLD_BRANCH="stable/mitaka"
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
             fi
             ;;