summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-08-28 07:12:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-28 07:12:05 +0000
commit8efd31d199379d593f3ea74f7d8a7eefd6046f61 (patch)
treead07ea792c937d4bd9b1a800d30c9ad4fb7ea904
parent5218c9fc5a6884f7ddd086089d85eb547149391a (diff)
parent24a9ac5a97f39d3b45b64cf01afbbe0af6704546 (diff)
Merge "Avoid exiting the script if an error happens"
-rw-r--r--jjb/functest/functest-alpine.sh1
-rw-r--r--jjb/functest/functest-daily-jobs.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index da098862a..f0e08e171 100644
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -66,6 +66,7 @@ fi
volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file_vol}"
+set +e
tiers=(healthcheck smoke features vnf)
for tier in ${tiers[@]}; do
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 802f82c99..23649fc08 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -418,6 +418,7 @@
- ./functest-env-presetup.sh
- ../../utils/fetch_os_creds.sh
- ./functest-alpine.sh
+ - ../../utils/push-test-logs.sh
- builder:
name: functest-daily