From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 26 May 2016 11:40:05 +0000 (+0200)
Subject: Take report arg into account
X-Git-Tag: colorado.1.0~368
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d5ba524bf4702fc586129e9bc902908efc763f13;p=functest.git

Take report arg into account

$report is now tested before calling odlreport2db.py

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

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index c206a9baa..8c87160ea 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -83,7 +83,8 @@ 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" &&
+            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/logs/2"