aboutsummaryrefslogtreecommitdiffstats
path: root/functest/ci
diff options
context:
space:
mode:
Diffstat (limited to 'functest/ci')
-rw-r--r--functest/ci/exec_test.sh9
-rw-r--r--functest/ci/testcases.yaml6
2 files changed, 6 insertions, 9 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index b15f5351..4d913c52 100644
--- 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,9 +150,6 @@ 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=${repos_dir}/sfc/tests/functest/odl-sfc
FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index fc835b93..1b7747c7 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -37,6 +37,9 @@ tiers:
dependencies:
installer: ''
scenario: '^((?!bgpvpn|odl_l3).)*$'
+ run:
+ module: 'functest.opnfv_tests.OpenStack.vPing.vping_ssh'
+ class: 'VPingSSH'
-
name: vping_userdata
@@ -48,6 +51,9 @@ tiers:
dependencies:
installer: ''
scenario: '^((?!lxd).)*$'
+ run:
+ module: 'functest.opnfv_tests.OpenStack.vPing.vping_userdata'
+ class: 'VPingUserdata'
-
name: tempest_smoke_serial