From 12b0527fe8ed422859998d070d044697a2039a9f Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 26 Mar 2014 23:15:36 +0000
Subject: [PATCH] Remove stable/grizzly provisions and workarounds

Any grizzly-specific configuration and routines are removed, but
this should not be merged until all stable/grizzly proposed changes
have been abandoned, corresponding branches tagged and deleted and
job removal in I39f93f67b96961cd9991b6a13fecddb16e3a20fa merged.

Change-Id: I7bec50a588f6a1753e3509bd3034f617e8cb6084
---
 devstack-vm-gate-wrap.sh | 16 +++++-----------
 devstack-vm-gate.sh      | 17 ++---------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 3ea69816..233a1ea8 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -183,9 +183,9 @@ export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-${DEFAULT_CONCURRENCY}}
 # for a stable branch we want to both try to upgrade forward n => n+1 as
 # well as upgrade from last n-1 => n.
 #
-# i.e. stable/havana:
-#   DGG=1 means stable/grizzly => stable/havana
-#   DGGF=1 means stable/havana => master (or stable/icehouse if that's out)
+# i.e. stable/icehouse:
+#   DGG=1 means stable/havana => stable/icehouse
+#   DGGF=1 means stable/icehouse => master (or stable/juno if that's out)
 export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0}
 export DEVSTACK_GATE_GRENADE_FORWARD=${DEVSTACK_GATE_GRENADE_FORWARD:-0}
 # DGGPN=1 means upgrade everything but n-cpu.
@@ -193,10 +193,7 @@ export DEVSTACK_GATE_GRENADE_PARTIAL_NCPU=${DEVSTACK_GATE_GRENADE_PARTIAL_NCPU:-
 
 if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
     export DEVSTACK_GATE_TEMPEST=1
-    if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
-        export GRENADE_OLD_BRANCH="stable/grizzly"
-        export GRENADE_NEW_BRANCH="stable/havana"
-    elif [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
+    if [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="stable/icehouse"
     else # master
@@ -211,10 +208,7 @@ if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
     # the roll forward case
 elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
     export DEVSTACK_GATE_TEMPEST=1
-    if [ "$ZUUL_BRANCH" == "stable/grizzly" ]; then
-        export GRENADE_OLD_BRANCH="stable/grizzly"
-        export GRENADE_NEW_BRANCH="stable/havana"
-    elif [ "$ZUUL_BRANCH" == "stable/havana" ]; then
+    if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="master"
     fi
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 4b7d743b..92e41b91 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -50,19 +50,7 @@ function setup_localrc() {
     # the exercises we *don't* want to test on for devstack
     SKIP_EXERCISES=boot_from_volume,bundle,client-env,euca
 
-    if [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
-        SKIP_EXERCISES=${SKIP_EXERCISES},swift,client-args
-        if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
-            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
-            echo "Q_USE_DEBUG_COMMAND=True" >>localrc
-            echo "NETWORK_GATEWAY=10.1.0.1" >>localrc
-        else
-            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
-        fi
-        if [ "$DEVSTACK_GATE_CELLS" -eq "1" ]; then
-            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
-        fi
-    elif [ "$LOCALRC_BRANCH" == "stable/havana" ]; then
+    if [ "$LOCALRC_BRANCH" == "stable/havana" ]; then
         MY_ENABLED_SERVICES+=,c-bak
         # we don't want to enable services for grenade that don't have upgrade support
         # otherwise they can break grenade, especially when they are projects like
@@ -369,8 +357,7 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
         res=$?
     fi
 
-    if [[ "$GRENADE_OLD_BRANCH" != "stable/grizzly" ]] && \
-       [[ "$DEVSTACK_GATE_TEMPEST_STRESS" -ne "1" ]] ; then
+    if [[ "$DEVSTACK_GATE_TEMPEST_STRESS" -ne "1" ]] ; then
         tools/check_logs.py -d $BASE/new/screen-logs
         res2=$?
     fi