diff options
| author | Bernard Ogden <bernie.ogden@linaro.org> | 2016-01-05 10:10:04 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2016-01-05 10:15:55 +0000 |
| commit | 3505beaa721c1b3068e9d6f8a5169dd45b064c97 (patch) | |
| tree | 8ae584dc8a88d76355a6e3a7d08c0475064770db | |
| parent | de1f3a9c23abf9044f8cf07bae990355ea2a6155 (diff) | |
Revert "tcwg-buildfarm-master-hetzner-bernie: Revert "tcwg-buildfarm-*: Honor $dont_fail flag in trap cleanup""
This reverts commit a6a86759fa043300cb4d360e8a1dda1cb82c2bbe.
Reverting earlier reversion, so that we can apply
https://review.linaro.org/#/c/9800/
Change-Id: I7cf51ad4e79d57aea3546a065ee0fa1a6b711d3c
| -rw-r--r-- | tcwg-buildfarm-master-hetzner-bernie.yaml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tcwg-buildfarm-master-hetzner-bernie.yaml b/tcwg-buildfarm-master-hetzner-bernie.yaml index 7b9e642..b2937ff 100644 --- a/tcwg-buildfarm-master-hetzner-bernie.yaml +++ b/tcwg-buildfarm-master-hetzner-bernie.yaml @@ -158,11 +158,14 @@ BUILD_SHELL="schroot -r -c session:$session_id --preserve-environment -- bash" $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a" + result="1" + # Sometimes /dev/pts can't get unmounted on the first try. # Workaround by retrying. - trap "schroot -f -e -c session:$session_id || sleep 60 || schroot -f -e -c session:$session_id" 0 1 2 3 5 9 13 15 + trap "{ schroot -f -e -c session:$session_id || { sleep 60 ; schroot -f -e -c session:$session_id } }; exit \$result" 0 1 2 3 5 9 13 15 - ${BUILD_SHELL} -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap $runtests_opt --excludecheck ${excludecheck} --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild -o '--tarbin' || result="$?" + ${BUILD_SHELL} -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap $runtests_opt --excludecheck ${excludecheck} --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild -o '--tarbin' | true + result="${PIPESTATUS[0]}" #Do not trigger a benchmark if jenkins.sh exits without error and #without having built a toolchain (probably because --norebuild was |