From b885491e3c2d5a1bd947631afd96ed8006ef8771 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Wed, 20 Jul 2016 19:34:51 +0200
Subject: Bugfix: ODL report to DB fails
JIRA: FUNCTEST-370
Change-Id: I48c8927f3490b86fcf1c95656324429b70201653
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
ci/exec_test.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(limited to 'ci')
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 82a7a31bc..7e57cd5e4 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -87,15 +87,15 @@ function run_test(){
--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/"
- # node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
- # python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
- # fi
+ 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/"
+ node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
+ python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
+ fi
;;
"tempest_smoke_serial")
python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
--
cgit