From 824638d3e936bdb77799203d8e1ea37c95434404 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Mon, 14 Dec 2015 16:41:24 +0100
Subject: Add a flag to push the results to the DB optionaly

By default, it will NOT push, only if specified by -r
The parameter must be taken from a Jenkins job set to TRUE

JIRA: FUNCTEST-84

Change-Id: Iee3b293e90b052b88de2d4f1d337f5ec5e3b3941
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 docker/run_tests.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'docker/run_tests.sh')

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 55a6d905e..081fe02df 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -15,6 +15,7 @@ usage:
 where:
     -o|--offline      optional offline mode (experimental)
     -h|--help         show this help text
+    -r|--report       push results to database (false by default)
     -t|--test         run specific set of tests
       <test_name>     one or more of the following: vping,odl,rally,tempest,vims. Separated by comma.
 
@@ -28,6 +29,7 @@ examples:
 # Support for Functest offline
 # NOTE: Still not 100% working when running the tests
 offline=false
+report=""
 arr_test=(vping odl tempest vims rally)
 
 
@@ -39,7 +41,8 @@ function run_test(){
     case $test_name in
         "vping")
             info "Running vPing test..."
-            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py --debug ${FUNCTEST_REPO_DIR}/ -r
+            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \
+                --debug ${FUNCTEST_REPO_DIR}/ ${report}
         ;;
         "odl")
             info "Running ODL test..."
@@ -75,7 +78,8 @@ function run_test(){
         ;;
         "tempest")
             info "Running Tempest smoke tests..."
-            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py --debug ${FUNCTEST_REPO_DIR}/ -m smoke
+            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \
+                --debug ${FUNCTEST_REPO_DIR}/ -m smoke ${report}
             # save tempest.conf for further troubleshooting
             tempest_conf="${RALLY_VENV_DIR}/tempest/for-deployment-*/tempest.conf"
             if [ -f ${tempest_conf} ]; then
@@ -84,11 +88,13 @@ function run_test(){
         ;;
         "vims")
             info "Running vIMS test..."
-            python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py --debug ${FUNCTEST_REPO_DIR}/
+            python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \
+                --debug ${FUNCTEST_REPO_DIR}/ ${report}
         ;;
         "rally")
             info "Running Rally benchmark suite..."
-            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug ${FUNCTEST_REPO_DIR}/ all
+            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally.py \
+                --debug ${FUNCTEST_REPO_DIR}/ all ${report}
         ;;
     esac
 }
@@ -107,6 +113,9 @@ while [[ $# > 0 ]]
         -o|--offline)
             offline=true
         ;;
+        -r|--report)
+            report="-r"
+        ;;
         -t|--test|--tests)
             TEST="$2"
             shift
-- 
cgit 1.2.3-korg