summaryrefslogtreecommitdiffstats
path: root/ci/exec_test.sh
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-22 08:43:46 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-22 08:43:46 +0000
commit8c979f22b592f38569fccef115d1f8036909722f (patch)
tree19b92caeaad16b0431cc17bc86d18bc11f21e014 /ci/exec_test.sh
parent3367c03a2ff39f148e55576a8b4fa0418dd4c041 (diff)
parenta868e1bb75987119c87112d08a194564d84b53ee (diff)
Merge "Add reporting to DB in OpenDaylightTesting"
Diffstat (limited to 'ci/exec_test.sh')
-rwxr-xr-xci/exec_test.sh16
1 files changed, 6 insertions, 10 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index a6eeab49b..03eb2c873 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -80,21 +80,17 @@ function run_test(){
;;
"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 \