summaryrefslogtreecommitdiffstats
path: root/ci/exec_test.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/exec_test.sh')
-rwxr-xr-xci/exec_test.sh20
1 files changed, 8 insertions, 12 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index d7883307b..03eb2c873 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -73,28 +73,24 @@ function run_test(){
${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh
;;
"vping_ssh")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vPing_ssh.py $report
+ python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m ssh $report
;;
"vping_userdata")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vPing_userdata.py $report
+ python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m userdata $report
;;
"odl")
odl_tests
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \
- --keystoneip $keystone_ip --neutronip $neutron_ip \
- --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
- --ospassword ${OS_PASSWORD} \
- --odlip $odl_ip --odlwebport $odl_port
-
- # push results to the DB in case of CI
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/"
- odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
- python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml
+ args=-p
fi
+ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \
+ --keystoneip $keystone_ip --neutronip $neutron_ip \
+ --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
+ --ospassword ${OS_PASSWORD} \
+ --odlip $odl_ip --odlwebport $odl_port ${args}
;;
"tempest_smoke_serial")
python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \