diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2015-12-17 09:19:53 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2015-12-17 12:14:39 +0000 |
| commit | 4ee1dbb130be2ba8742855d41d61661a79edc201 (patch) | |
| tree | dcd99d88599841dd9ab486adebdfa78dd0c24fea /tcwg-buildfarm-master-hetzner-bernie.yaml | |
| parent | 1eff27c6cce65ed8e5a47a42527bf68c73c40a11 (diff) | |
tcwg-buildfarm-*: Honor $dont_fail flag in trap cleanup
Change-Id: I52aaf29092e6897e4797cca897ee5e0cb532cae5
Signed-off-by: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Diffstat (limited to 'tcwg-buildfarm-master-hetzner-bernie.yaml')
| -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 d43f73a..e806164 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 |