From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Mon, 2 May 2016 07:21:21 +0000 (+0200)
Subject: Functest, fix 'if-else' statment 'brahmaputra' instead of 'stable
X-Git-Tag: colorado.1.0~542
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=63ece054671bdd98247e2d89e7ebd72b69078731;p=releng.git

Functest, fix 'if-else' statment 'brahmaputra' instead of 'stable

Also, turn CI_DEBUG to true.

Change-Id: Id5c4c0ab65492b668fc5c22213c03f53faf9f9d8
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index d31b6a846..52f2f61bc 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -194,7 +194,7 @@
             description: "Push the results of all the tests to the resultDB"
         - string:
             name: CI_DEBUG
-            default: 'false'
+            default: 'true'
             description: "Show debug output information"
 ########################
 # trigger macros
@@ -222,7 +222,7 @@
             #!/bin/bash
             set -e
             echo "Functest: run $FUNCTEST_SUITE_NAME"
-            if [[ ${branch} == *"stable"* ]]; then
+            if [[ ${branch} == *"brahmaputra"* ]]; then
                 cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
             else
                 cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
@@ -237,7 +237,7 @@
             #!/bin/bash
             set +e
             [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
-            if [[ ${branch} == *"stable"* ]]; then
+            if [[ ${branch} == *"brahmaputra"* ]]; then
                 cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
             else
                 cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
@@ -313,7 +313,7 @@
                 echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                 exit 1
             fi
-            if [[ ${branch} == *"stable"* ]]; then
+            if [[ ${branch} == *"brahmaputra"* ]]; then
                 cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
             else
                 cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"