bugfix: Don't try to run a tier if it doesn't contain any enabled test

[functest.git] / ci / exec_test.sh

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 82a7a31..7e57cd5 100755 (executable)
--- 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 \