summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-04-20 15:00:20 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-20 15:00:20 +0000
commite49f91bd644b140a4ad7a2bf8c30faf9d5bdcfbb (patch)
treea7dfdfcb2fe616c07cef4a9f6766b9e08ee1228e
parentca87d5fdb49a7a29a8eda96fc49e27d2815221b3 (diff)
parent2a78854a2c72a7d4dcc57cbbb71c16eb17767628 (diff)
Merge "Functest, set exit on error for single suites (set -e)"
-rw-r--r--jjb/functest/functest-ci-jobs.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 8505e4046..1e16fcfb8 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -222,11 +222,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
@@ -247,7 +245,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=""