diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-11-23 10:13:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-23 10:13:08 +0000 |
| commit | d51ab9676f7c6264ffe42be42ba70f5a273a290f (patch) | |
| tree | edd1fe70be20821820061b69c23ec0ed691a14f6 /functest/ci | |
| parent | 453784f3cae39e7b59e530d27f0b49cef17c7e55 (diff) | |
| parent | 41076c1e725437f92095fcefd982a154f6d06f32 (diff) | |
Merge "Adapt vping testcases to the new template"
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/exec_test.sh | 6 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index 8dc409d3..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 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 |