From e9edaa3a21090a2a1dae49b332213e9b1bed5382 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Mon, 6 May 2013 09:23:05 -0700
Subject: [PATCH] Remove diablo/essex conditionals.

The stable/diablo and stable/essex branches are closed.  Clean up
custom logic for those branches.

Change-Id: I54cd2a273e62d92a4cc5436481e96764226fa7a4
---
 devstack-vm-gate.sh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 5aa21742..940f0eac 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -46,11 +46,7 @@ function setup_localrc() {
 
     SKIP_EXERCISES=boot_from_volume,client-env
 
-    if [ "$LOCALRC_BRANCH" == "stable/diablo" ] ||
-        [ "$LOCALRC_BRANCH" == "stable/essex" ]; then
-        MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-vol,n-net
-        SKIP_EXERCISES=$SKIP_EXERCISES,swift
-    elif [ "$LOCALRC_BRANCH" == "stable/folsom" ]; then
+    if [ "$LOCALRC_BRANCH" == "stable/folsom" ]; then
         MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net,swift
         if [ "$DEVSTACK_GATE_CINDER" -eq "1" ]; then
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
@@ -154,11 +150,6 @@ EOF
     fi
 }
 
-
-if [ "$ZUUL_BRANCH" == "stable/diablo" ]; then
-    export DEVSTACK_GATE_TEMPEST=0
-fi
-
 if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
     cd $BASE/old/devstack
     setup_localrc "old" "$GRENADE_OLD_BRANCH"