summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-10 22:57:08 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-10 22:57:08 +0100
commit6e4d8650a66fa5f7e20dcbf3f50bb2cd57ba8d0d (patch)
treefe9d72e599ef4d58271ccf79e38fddfd36c8908c
parent166795052df6ff64cd21a63842d17805f293f8ef (diff)
downloadjenkins.debian.net-6e4d8650a66fa5f7e20dcbf3f50bb2cd57ba8d0d.tar.xz
reproducible freebsd: dont fail the complete job even if one branch fails to build
-rwxr-xr-xbin/reproducible_freebsd.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index 6f3c2a6f..a67a206f 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -79,13 +79,15 @@ for FREEBSD_TARGET in ${FREEBSD_TARGETS} ;do
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT+12"
export LANG="en_GB.UTF-8"
- # actually build everything
NUM_CPU=4 # if someone could tell me how to determine this on FreeBSD, this would be neat
+ # actually build everything
+ set +e
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG sudo make -j $NUM_CPU buildworld"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG sudo make -j $NUM_CPU buildkernel"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG DESTDIR=$TMPDIR sudo make -j $NUM_CPU installworld"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG DESTDIR=$TMPDIR sudo make -j $NUM_CPU installkernel"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG DESTDIR=$TMPDIR sudo make -j $NUM_CPU distribution"
+ set -e
# save results in b1
save_freebsd_results b1
@@ -104,11 +106,13 @@ for FREEBSD_TARGET in ${FREEBSD_TARGETS} ;do
# use allmost all cores for second build
NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
# actually build everything
+ set +e
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL sudo make -j $NEW_NUM_CPU buildworld"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL sudo make -j $NEW_NUM_CPU buildkernel"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL DESTDIR=$TMPDIR sudo make -j $NEW_NUM_CPU installworld"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL DESTDIR=$TMPDIR sudo make -j $NEW_NUM_CPU installkernel"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL DESTDIR=$TMPDIR sudo make -j $NEW_NUM_CPU distribution"
+ set -e
# save results in b2
save_freebsd_results b2