summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-12-21 20:10:58 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-21 20:10:58 +0100
commitbaafa49fcd426fdd1477d0f6d2d3526917b39f7b (patch)
tree3947dd595def4bc1d53f753c8ccc54a78e44ccba
parenta7e438950510b4c72c42d0e4acefbf9b7b3353d1 (diff)
downloadjenkins.debian.net-baafa49fcd426fdd1477d0f6d2d3526917b39f7b.tar.xz
reproducible archlinux: follow up on 321db95 but revert the conditions to fail loudly and silently, to confirm the observations…
-rwxr-xr-xbin/reproducible_build_archlinux_pkg.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index bbeafcfb..9190f6f3 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -234,13 +234,11 @@ remote_build() {
if [ $RESULT -ne 0 ] ; then
ssh -p $PORT $FQDN "rm -r $TMPDIR" || true
if [ $RESULT -eq 23 ] ; then
- echo "$(date -u) - remote job could not end schroot session properly, failing loudly so we get a pointer for investigations."
- exit 1
- elif [ $RESULT -eq 42 ] ; then
- echo "$($date -u) - sigh, we know this problem and need to debug it and end the session cleanly. Failing silently for now." # FIXME
-
+ echo "$(date -u) - remote job could not end schroot session properly and sent error 23 so we could abort silently."
exec /srv/jenkins/bin/abort.sh
-
+ elif [ $RESULT -eq 42 ] ; then
+ echo "$($date -u) - sigh, we know this problem and need to debug it and end the session cleanly. Failing loudly now so we can see this used to indeed silence things… (but we'll get noise from the other failures enabled in this commit…" # FIXME
+ exit 1
else
handle_remote_error "with exit code $RESULT from $NODE for build #$BUILDNR for ${SRCPACKAGE} from $REPOSITORY"
fi