Merge "solve failure testcases are not pushed to testDB problem"

[functest.git] / functest / ci / exec_test.sh

diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 5649530..4d913c5 100644 (file)
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -84,12 +84,6 @@ function run_test(){
         "healthcheck")
             ${FUNCTEST_TEST_DIR}/OpenStack/healthcheck/healthcheck.sh
         ;;
-        "vping_ssh")
-            python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m ssh $report
-        ;;
-        "vping_userdata")
-            python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m userdata $report
-        ;;
         "odl")
             odl_tests
             [[ "$report" == "-r" ]] && args=-p
@@ -156,12 +150,8 @@ function run_test(){
                 $clean_flag -s -m feature_multisite $report \
                 -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf
         ;;
-        "domino")
-            python ${FUNCTEST_TEST_DIR}/features/domino.py $report
-        ;;
         "odl-sfc")
-            ODL_SFC_DIR=${FUNCTEST_TEST_DIR}/features/sfc
-            # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
+            ODL_SFC_DIR=${repos_dir}/sfc/tests/functest/odl-sfc
             FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
             source ${ODL_SFC_DIR}/tackerc
             python ${ODL_SFC_DIR}/sfc.py $report