tcwg-buildfarm-*: Honor $dont_fail flag in trap cleanup

Change-Id: I52aaf29092e6897e4797cca897ee5e0cb532cae5
Signed-off-by: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>

6 files changed, 31 insertions, 15 deletions

diff --git a/tcwg-buildfarm-2steps-master-cambridge.yaml b/tcwg-buildfarm-2steps-master-cambridge.yaml
index 410a8d0..45e3e42 100644
--- a/tcwg-buildfarm-2steps-master-cambridge.yaml
+++ b/tcwg-buildfarm-2steps-master-cambridge.yaml
@@ -147,11 +147,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; }" 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
 
-            result=0
             case $target in
             aarch64-linux-gnu)
               # Since we are cross-testing, prepare environment for
@@ -179,9 +180,11 @@
               echo "cross_check_script_path=`pwd`/cross_check_script_$target" >> cross_check_parameters_$target
               echo "builder=`hostname -f` " >> cross_check_parameters_$target
               cat cross_check_parameters_$target
+              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="$?"
+              ${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 | true
+              result="${PIPESTATUS[0]}"
               ;;
             esac
 
diff --git a/tcwg-buildfarm-master-cambridge.yaml b/tcwg-buildfarm-master-cambridge.yaml
index 9219b72..1428f6f 100644
--- a/tcwg-buildfarm-master-cambridge.yaml
+++ b/tcwg-buildfarm-master-cambridge.yaml
@@ -161,12 +161,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
 
-            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="$?"
+            ${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 | true
+            result="${PIPESTATUS[0]}"
 
             echo "Result of jenkins.sh: $result"
             if $dont_fail; then
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
diff --git a/tcwg-buildfarm-master-hetzner.yaml b/tcwg-buildfarm-master-hetzner.yaml
index c99327c..be985b2 100644
--- a/tcwg-buildfarm-master-hetzner.yaml
+++ b/tcwg-buildfarm-master-hetzner.yaml
@@ -161,11 +161,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 || 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 | true
+            result="${PIPESTATUS[0]}"
 
             echo "Result of jenkins.sh: $result"
             if $dont_fail; then
diff --git a/tcwg-buildfarm-master.yaml b/tcwg-buildfarm-master.yaml
index 20155b0..7eafa1f 100644
--- a/tcwg-buildfarm-master.yaml
+++ b/tcwg-buildfarm-master.yaml
@@ -161,11 +161,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 || 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 | true
+            result="${PIPESTATUS[0]}"
 
             echo "Result of jenkins.sh: $result"
             if $dont_fail; then
diff --git a/tcwg-buildfarm-maxim.yaml b/tcwg-buildfarm-maxim.yaml
index 57daacb..f6ac028 100644
--- a/tcwg-buildfarm-maxim.yaml
+++ b/tcwg-buildfarm-maxim.yaml
@@ -184,12 +184,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
 
-            result="0"
-            ${BUILD_SHELL} -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild || result="$?"
+            ${BUILD_SHELL} -x ./jenkins.sh --target ${target} --gcc-branch ${gcc_branch} --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt --fileserver ex40-01.tcwglab.linaro.org/snapshots-ref --logserver $log_server $logname_opt $norebuild | true
+            result="${PIPESTATUS[0]}"
 
             echo "Result of jenkins.sh: $result"
             if $dont_fail; then