From 63dde7f047de53974fde9bb35c25a080d9e0f18f Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 17 Mar 2015 18:16:47 +0000
Subject: [PATCH] Rename test sets and include more api tests

This patch implements the following changes:

'commit_aio' tests are now called 'scenario' tests
 - this is now set as the default test set

'commit_multinode' tests are now called 'api' tests
 - network, compute, object_storage tests have been added

'nightly_heat_multinode' tests are now called 'smoke' tests

Change-Id: Ic415eab199f647a3a4029c535aeceb86291da162
Implements: blueprint additional-tempest-checks
---
 .../templates/openstack_tempest_gate.sh.j2    | 20 +++++++++----------
 scripts/gate-check-commit.sh                  |  2 --
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2 b/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2
index e58d2c62a0..96fd117474 100644
--- a/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2
+++ b/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2
@@ -25,35 +25,33 @@ set -x
 # The only parameter this script takes is the name of a test list to use:
 # ./$0 <test_list_name>
 #
-# If a name is not supplied commit_multinode will be used.
+# If a name is not supplied scenario will be used.
 
-test_list_name=${1:-commit_multinode}
+test_list_name=${1:-scenario}
 testr_ouput_lines=${testr_output_lines:-100}
 RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-''}
 TESTR_OPTS=${TESTR_OPTS:-''}
 
 
 # -------------------- Functions -------------------------
-# Test list functions. Each tempest test scenario (eg commit gate, nightly,
-# pre release) should have a function here to generate the list of tests that
+# Test list functions. Each tempest test scenario (eg scenario, api, smoke,
+# defcore) should have a function here to generate the list of tests that
 # should be run. Each function takes in the full list of tempest tests and
 # should output a filtered list.
 
-function gen_test_list_commit_multinode() {
+function gen_test_list_api() {
   # filter test list to produce list of tests to use.
-  egrep 'tempest\.api\.(identity|image|volume)'\
-    |grep -vi xml \
-    |grep -v compute \
-    |grep -v VolumesV.ActionsTest
+  egrep 'tempest\.api\.(identity|image|volume|network|compute|object_storage)'\
+    |grep -vi xml
 }
 
 # Run selected scenario tests
-function gen_test_list_commit_aio() {
+function gen_test_list_scenario() {
   egrep 'tempest\.scenario\.test_(minimum|swift|server|network)_basic(_ops)?'
 }
 
 # Run smoke tests
-function gen_test_list_nightly_heat_multinode() {
+function gen_test_list_smoke() {
   grep smoke
 }
 
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 7c726c5e9f..d4787ef3be 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -32,8 +32,6 @@ export DEPLOY_LOGGING=${DEPLOY_LOGGING:-"yes"}
 export DEPLOY_OPENSTACK=${DEPLOY_OPENSTACK:-"yes"}
 export DEPLOY_SWIFT=${DEPLOY_SWIFT:-"yes"}
 export DEPLOY_TEMPEST=${DEPLOY_TEMPEST:-"yes"}
-# Set the level of tempest testing, default is unset which uses `commit_multinode`
-export TEMPEST_SCRIPT_PARAMETERS=${TEMPEST_SCRIPT_PARAMETERS:-"commit_aio"}
 # Limit the gate check to only performing one attempt, unless already set
 export MAX_RETRIES=${MAX_RETRIES:-"1"}
 # limit forks for gate check