Merge "Add Moon in Functest"

[functest.git] / ci / exec_test.sh

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 0bb8389..362cd9e 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -83,7 +83,10 @@ function run_test(){
                 ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh
 
             # push results to the DB in case of CI
-            if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then
+            if [[ "$report" == "-r" &&
+                  -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
+                  -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
+               env | grep NODE_NAME > /dev/null; then
                 odl_logs="/home/opnfv/functest/results/odl/logs/2"
                 odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
                 node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
@@ -112,11 +115,7 @@ function run_test(){
             python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py
         ;;
         "onos")
-            if [ "$INSTALLER_TYPE" == "joid" ]; then
-                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -i joid
-            else
-                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
-            fi
+            python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
       ;;
         "promise")
             python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report
@@ -126,12 +125,30 @@ function run_test(){
             python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py
         ;;
         "ovno")
-            ${repos_dir}/ovno/Testcases/RunTests.sh
+            # suite under rewritting for colorado
+            # no need to run anything until refactoring done
+            # ${repos_dir}/ovno/Testcases/RunTests.sh
+        ;;
+        "security_scan")
+            echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/stackrc for undercloud .."
+            source ${FUNCTEST_CONF_DIR}/stackrc
+            python ${FUNCTEST_REPO_DIR}/testcases/security_scan/security_scan.py --config ${FUNCTEST_REPO_DIR}/testcases/security_scan/config.ini
+        ;;
+        "copper")
+            python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py
+        ;;
+        "moon")
+            # TODO put the link to Moon script to be run (if test runnable) here
+            ${repos_dir}/moon/tests/run_tests.sh
         ;;
         *)
             echo "The test case '${test_name}' does not exist."
             exit 1
     esac
+
+    if [[ $? != 0 ]]; then exit 1
+    else exit 0
+    fi
 }