Run tempest from docker using run_tempest

[functest.git] / docker / run_tests.sh

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index c794d3b..55a6d90 100755 (executable)
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -16,7 +16,7 @@ where:
     -o|--offline      optional offline mode (experimental)
     -h|--help         show this help text
     -t|--test         run specific set of tests
-      <test_name>     one or more of the following: vping,odl,rally,tempest. Separated by comma.
+      <test_name>     one or more of the following: vping,odl,rally,tempest,vims. Separated by comma.
 
 
 examples:
@@ -28,7 +28,7 @@ examples:
 # Support for Functest offline
 # NOTE: Still not 100% working when running the tests
 offline=false
-arr_test=(vping odl rally tempest)
+arr_test=(vping odl tempest vims rally)
 
 
 function run_test(){
@@ -54,6 +54,15 @@ function run_test(){
             elif [ $INSTALLER_TYPE == "foreman" ]; then
                 #odl_port=8081
                 ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+            elif [ $INSTALLER_TYPE == "apex" ]; then
+                # TODO
+                ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+            elif [ $INSTALLER_TYPE == "joid" ]; then
+                # TODO
+                ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+            elif [ $INSTALLER_TYPE == "compass" ]; then
+                # TODO
+                ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
             else
                 error "INSTALLER_TYPE not valid."
                 exit 1
@@ -64,20 +73,23 @@ function run_test(){
                 cp -Rf  ${odl_logs} ${FUNCTEST_CONF_DIR}/ODL/
             fi
         ;;
-        "rally")
-            info "Running Rally benchmark suite..."
-            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug ${FUNCTEST_REPO_DIR}/ all
-        ;;
         "tempest")
             info "Running Tempest smoke tests..."
-            rally verify start smoke
-            rally verify list
+            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py --debug ${FUNCTEST_REPO_DIR}/ -m smoke
             # save tempest.conf for further troubleshooting
             tempest_conf="${RALLY_VENV_DIR}/tempest/for-deployment-*/tempest.conf"
             if [ -f ${tempest_conf} ]; then
                 cp $tempest_conf ${FUNCTEST_CONF_DIR}
             fi
         ;;
+        "vims")
+            info "Running vIMS test..."
+            python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py --debug ${FUNCTEST_REPO_DIR}/
+        ;;
+        "rally")
+            info "Running Rally benchmark suite..."
+            python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug ${FUNCTEST_REPO_DIR}/ all
+        ;;
     esac
 }
 
@@ -95,7 +107,7 @@ while [[ $# > 0 ]]
         -o|--offline)
             offline=true
         ;;
-        -t|--tests)
+        -t|--test|--tests)
             TEST="$2"
             shift
         ;;