diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2016-01-06 16:39:13 +0100 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2016-01-07 08:29:33 +0000 |
| commit | a2c696fde5d762af2ece2fe1f8f711040cac7d92 (patch) | |
| tree | bcb750adcc42e7ebfd55cc4ed52b4a1e18fd14fe /tcwg-buildfarm-master-hetzner.yaml | |
| parent | 2bb06fa4561bcb21e0c03127dbab6f77cbce6aa8 (diff) | |
tcwg-buildfarm-2steps-master-cambridge
tcwg-buildfarm-master-cambridge
tcwg-buildfarm-master-hetzner
tcwg-buildfarm-master
tcwg-buildfarm-maxim: Trap EXIT only
Trap will run when script exits, including in all the cases we
explicitly trapped before. But now it will only run once, even
if we have an abnormal exit.
In case of abnormal exit, the exit code is 128+signal number.
We also remove the use of $result in trap.
tcwg-buildfarm-master-hetzner-bernie: Force initialization of
$result for consistency.
Change-Id: I3843317036e8dbc426a8498dced6f9a36d608198
Diffstat (limited to 'tcwg-buildfarm-master-hetzner.yaml')
| -rw-r--r-- | tcwg-buildfarm-master-hetzner.yaml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tcwg-buildfarm-master-hetzner.yaml b/tcwg-buildfarm-master-hetzner.yaml index 8534f562b6..eb04aae8f2 100644 --- a/tcwg-buildfarm-master-hetzner.yaml +++ b/tcwg-buildfarm-master-hetzner.yaml @@ -161,14 +161,12 @@ 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 } }; exit \$result" 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; } }" 0 - ${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 | cat - result="${PIPESTATUS[0]}" + result="0" + ${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 || result=$? echo "Result of jenkins.sh: $result" if $dont_fail; then |