diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-20 11:01:59 +0100 |
|---|---|---|
| committer | Morgan Richomme <morgan.richomme@orange.com> | 2016-01-20 10:41:40 +0000 |
| commit | aaf02b24f9c42c41205083a151e09b885788cfb5 (patch) | |
| tree | 822ed4994ceddc1b659f3cff905abb7243373ed1 | |
| parent | a7930e2b4ef5a9dc715d5dae00232c338d9313a7 (diff) | |
create 2 vPing scenario:vping and vping-userdata
the new vping scenario does not use the userdata/cloudinit functions
JIRA: FUNCTEST-3
Change-Id: Ia535a50a9cfd50d520b87c2dd9195747a61b0f1f
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
(cherry picked from commit 4475765f05a24e14f1d90db28941ff5ba5ca1be7)
| -rwxr-xr-x | docker/run_tests.sh | 5 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 15 | ||||
| -rw-r--r-- | testcases/vPing/CI/libraries/vPing.py | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 7e8b01206..6ae12b906 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -59,6 +59,11 @@ function run_test(){ python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing2.py \ --debug ${report} ;; + "vping_userdata") + info "Running vPing test using userdata/cloudinit.... " + python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \ + --debug ${report} + ;; "odl") info "Running ODL test..." neutron_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index 6a612067b..229cb9b7d 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -158,13 +158,13 @@ results: # and if vPing is failing is usually not needed to continue... test_exec_priority: 1: vping - 2: tempest - 3: odl - 4: onos - 5: ovno - #6: doctor - 7: promise - #8: policy-test + 2: vping_userdata + 3: tempest + 4: odl + 5: onos + 6: ovno + #7: doctor + 8: promise #9: odl-vpn_service-tests #10: opnfv-yardstick-tc026-sdnvpn #11: openstack-neutron-bgpvpn-api-extension-tests @@ -222,6 +222,7 @@ test-dependencies: functest: vims: vping: + vping_userdata: tempest: rally: odl: diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py index b87de850d..f261ff32c 100644 --- a/testcases/vPing/CI/libraries/vPing.py +++ b/testcases/vPing/CI/libraries/vPing.py @@ -469,7 +469,7 @@ def main(): git_version = functest_utils.get_git_branch(REPO_PATH) pod_name = functest_utils.get_pod_name(logger) functest_utils.push_results_to_db(TEST_DB, - "vPing", + "vPing_userdata", logger, pod_name, git_version, payload={'timestart': start_time_ts, 'duration': duration, |