From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Wed, 20 Apr 2016 09:08:47 +0000 (+0200)
Subject: Functest, set exit on error for single suites (set -e)
X-Git-Tag: colorado.1.0~564^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2a78854a2c72a7d4dcc57cbbb71c16eb17767628;p=releng.git

Functest, set exit on error for single suites (set -e)

And don't push results to DB when running single suites.

Change-Id: Ifd0472536dccc39e4e15f8aa4b70bf3b5f35f9b9
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 79a5cabe1..3d2527cf5 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -219,11 +219,9 @@
     builders:
         - shell: |
             #!/bin/bash
-            set +e
-            flags="-s"
-            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
+            set -e
             echo "Functest: run $FUNCTEST_SUITE_NAME"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flags}"
+            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -244,7 +242,7 @@
     builders:
         - shell: |
             #!/bin/bash
-            set +e
+            set -e
             [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
             # labconfig is used only for joid
             labconfig=""