From 733ce52f794ceb6191334cb9b27dc36693d60dac Mon Sep 17 00:00:00 2001
From: Viktor Tikkanen <viktor.tikkanen@nokia.com>
Date: Thu, 11 Feb 2016 09:04:30 +0200
Subject: Enadled --serial option for run_tests.sh

It could be useful to execute e.g. Tempest test cases in a single
thread in order to troubleshoot possible concurrency problems.

Change-Id: I5e5fc190fb4483ff075a8f837a8d4116ece90c80
Signed-off-by: Viktor Tikkanen <viktor.tikkanen@nokia.com>
(cherry picked from commit 66df82a76334015e3e2d25ddcc22b343b110320c)
---
 docker/run_tests.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 83806d6f7..0f9e8a30c 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -22,6 +22,7 @@ where:
     -h|--help         show this help text
     -r|--report       push results to database (false by default)
     -n|--no-clean     do not clean OpenStack resources after test run
+    -s|--serial       run tests in one thread
     -t|--test         run specific set of tests
       <test_name>     one or more of the following separated by comma:
                             vping_ssh,vping_userdata,odl,rally,tempest,vims,onos,promise,ovno
@@ -38,6 +39,8 @@ examples:
 offline=false
 report=""
 clean=true
+serial=false
+
 # Get the list of runnable tests
 # Check if we are in CI mode
 
@@ -86,6 +89,10 @@ function run_test(){
     if [ $clean == "false" ]; then
         clean_flag="-n"
     fi
+    serial_flag=""
+    if [ $serial == "true" ]; then
+        serial_flag="-s"
+    fi
 
     case $test_name in
         "vping_ssh")
@@ -115,7 +122,7 @@ function run_test(){
         "tempest")
             info "Running Tempest tests..."
             python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \
-                --debug -m $clean_flag custom ${report}
+                --debug $serial_flag $clean_flag -m custom ${report}
             # save tempest.conf for further troubleshooting
             tempest_conf="${RALLY_VENV_DIR}/tempest/for-deployment-*/tempest.conf"
             if [ -f ${tempest_conf} ]; then
@@ -213,6 +220,9 @@ while [[ $# > 0 ]]
         -n|--no-clean)
             clean=false
         ;;
+        -s|--serial)
+            serial=true
+        ;;
         -t|--test|--tests)
             TEST="$2"
             shift
-- 
cgit 1.2.3-korg