From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 25 May 2016 09:22:31 +0000 (+0200)
Subject: Push results if INSTALLER_TYPE and NODE_NAME are defined
X-Git-Tag: colorado.1.0~371
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F14653%2F2;p=functest.git

Push results if INSTALLER_TYPE and NODE_NAME are defined

INSTALLER_TYPE and NODE_NAME are also checked before pushing ODL
results in DB

Change-Id: If92c8b50d3ae7618475aeb25ab732c6dddb08019
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 0bb8389d5..48f2894af 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -83,7 +83,9 @@ function run_test(){
                 ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh
 
             # push results to the DB in case of CI
-            if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then
+            if [[ -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/logs/2"
                 odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
                 node_name=$(env | grep NODE_NAME | cut -f2 -d'=')