X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Frun_tests.sh;h=ad8ab1128ae5523a1706e0ecef51da26106a6a08;hb=a71001dc2874725b494be6a0c18a586c5d0bfbe2;hp=9d5f681ca5ccf92316f72f0916c45bcce9d8c9e9;hpb=75149a9d278b5a969606ad182fff580c08e37d6c;p=functest.git

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 9d5f681ca..ad8ab1128 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -22,13 +22,15 @@ 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: vping,odl,rally,tempest,vims,onos,promise,ovno. Separated by comma.
+      <test_name>     one or more of the following separated by comma:
+                            vping_ssh,vping_userdata,odl,onos,tempest,rally,vims,promise,doctor
 
 
 examples:
     $(basename "$0")
-    $(basename "$0") --test vping,odl
+    $(basename "$0") --test vping_ssh,odl
     $(basename "$0") -t tempest,rally"
 
 
@@ -37,6 +39,8 @@ examples:
 offline=false
 report=""
 clean=true
+serial=false
+
 # Get the list of runnable tests
 # Check if we are in CI mode
 
@@ -81,16 +85,25 @@ function run_test(){
     echo "  Running test case: $i"
     echo "----------------------------------------------"
     echo ""
+    clean_flag=""
+    if [ $clean == "false" ]; then
+        clean_flag="-n"
+    fi
+    serial_flag=""
+    if [ $serial == "true" ]; then
+        serial_flag="-s"
+    fi
+
     case $test_name in
-        "vping")
-            info "Running vPing test..."
-            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing2.py \
-                --debug ${report}
+        "vping_ssh")
+            info "Running vPing-SSH test..."
+            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_ssh.py \
+                --debug $clean_flag ${report}
         ;;
         "vping_userdata")
-            info "Running vPing test using userdata/cloudinit.... "
-            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \
-                --debug ${report}
+            info "Running vPing-userdata test... "
+            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_userdata.py \
+                --debug $clean_flag ${report}
         ;;
         "odl")
             info "Running ODL test..."
@@ -109,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 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
@@ -120,13 +133,13 @@ function run_test(){
         "vims")
             info "Running vIMS test..."
             python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \
-                --debug ${report}
+                --debug $clean_flag ${report}
             clean_openstack
         ;;
         "rally")
             info "Running Rally benchmark suite..."
             python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py \
-                --debug all ${report}
+                --debug $clean_flag all ${report}
             clean_openstack
 
         ;;
@@ -141,6 +154,7 @@ function run_test(){
             pushd $tempest_dir
               . .venv/bin/activate
               pip install --no-deps -e ~/repos/bgpvpn/.
+              mkdir -p /etc/tempest/
               cp tempest.conf /etc/tempest/
               echo "[service_available]
 bgpvpn = True" >> /etc/tempest/tempest.conf
@@ -207,6 +221,9 @@ while [[ $# > 0 ]]
         -n|--no-clean)
             clean=false
         ;;
+        -s|--serial)
+            serial=true
+        ;;
         -t|--test|--tests)
             TEST="$2"
             shift
@@ -225,7 +242,7 @@ if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]] &&\
    [[ -f $tests_file ]]; then
     arr_test=($(cat $tests_file))
 else
-    arr_test=(vping tempest vims rally)
+    arr_test=(vping_ssh tempest vims rally)
 fi
 
 BASEDIR=`dirname $0`