From dc2d737c72881af5cf34b9ac366f22025236e618 Mon Sep 17 00:00:00 2001
From: "Mauro S. M. Rodrigues" <maurosr@linux.vnet.ibm.com>
Date: Tue, 4 Feb 2014 12:24:41 +0000
Subject: [PATCH] Remove exercises tests from grenade runs

For now on we're going to use smoke + scenarios tests.

Only devstack still uses exercises, so many references to it, and to exercises
to be skipped were kept.
Depends on: Iacb60ab011d2c7d90885b339b3c8454bd3de8219

Change-Id: I76305fae46a662177c6edcc9eca237c1d64be137
Closes-bug: #1023131
---
 devstack-vm-gate-wrap.sh | 6 +-----
 devstack-vm-gate.sh      | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index c93f22a2..b5c84710 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -178,23 +178,19 @@ export DEVSTACK_GATE_GRENADE_FORWARD=${DEVSTACK_GATE_GRENADE_FORWARD:-0}
 export DEVSTACK_GATE_GRENADE_ROLLING=${DEVSTACK_GATE_GRENADE_ROLLING:-0}
 
 if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
-    export DEVSTACK_GATE_EXERCISES=1
+    export DEVSTACK_GATE_TEMPEST=1
     if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
         export GRENADE_OLD_BRANCH="stable/grizzly"
         export GRENADE_NEW_BRANCH="stable/havana"
-        export DEVSTACK_GATE_TEMPEST=1
     elif [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="stable/icehouse"
-        export DEVSTACK_GATE_TEMPEST=1
     else # master
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="master"
-        export DEVSTACK_GATE_TEMPEST=1
     fi
     # the roll forward case
 elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
-    export DEVSTACK_GATE_EXERCISES=1
     export DEVSTACK_GATE_TEMPEST=1
     if [ "$ZUUL_BRANCH" == "stable/grizzly" ]; then
         export GRENADE_OLD_BRANCH="stable/grizzly"
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index b84a022f..df0d060e 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -47,7 +47,7 @@ function setup_localrc() {
         MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,tempest
     fi
 
-    # the exercises we *don't* want to test on for grenade
+    # 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
@@ -249,7 +249,6 @@ BASE_DEVSTACK_DIR=\$BASE_RELEASE_DIR/devstack
 TARGET_RELEASE=new
 TARGET_RELEASE_DIR=$BASE/\$TARGET_RELEASE
 TARGET_DEVSTACK_DIR=\$TARGET_RELEASE_DIR/devstack
-TARGET_RUN_EXERCISES=False
 TARGET_RUN_SMOKE=False
 SAVE_DIR=\$BASE_RELEASE_DIR/save
 EOF