summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-06-20 11:28:10 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-20 11:28:10 +0200
commit8d7efe71efb50fb9d83573af953cc3f9d2db23e9 (patch)
tree1dca17584584046bf85157bc3607e32c8dbdc3ff
parent61ab869eed27848b4867fbc029f2c068eecb7837 (diff)
downloadjenkins.debian.net-8d7efe71efb50fb9d83573af953cc3f9d2db23e9.tar.xz
reproducible debian: disable armhf again until #827724 is fixed
-rwxr-xr-xbin/reproducible_build.sh24
1 files changed, 14 insertions, 10 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 82fe1ccc..21ad9b0e 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -4,16 +4,6 @@
# © 2015-2016 Mattia Rizzolo <mattia@mapreri.org>
# released under the GPLv=2
-# disable everything
-if [ "$(dpkg --print-architecture)" = "armhf" ] ; then
- echo -n "temporarily stopping the builds on armhf, new debhelper is buggy, needs investigation… sleeping 12h now…"
- for i in $(seq 1 12) ; do
- sleep 1h
- echo -n "."
- done
- exit 0
-fi
-
DEBUG=false
. /srv/jenkins/bin/common-functions.sh
common_init "$@"
@@ -23,6 +13,19 @@ common_init "$@"
set -e
+exit_early_if_debian_is_broken() {
+ # disable everything until #827724 is fixed
+ # (it would be very nice to query udd to see if this bug is fixed and then automatically enable again…)
+ if [ "$ARCH" = "armhf" ] ; then
+ echo -n "temporarily stopping the builds on armhf due to #827724… sleeping 12h now…"
+ for i in $(seq 1 12) ; do
+ sleep 1h
+ echo -n "."
+ done
+ exit 0
+ fi
+}
+
create_results_dirs() {
mkdir -vp $DEBIAN_BASE/dbd/${SUITE}/${ARCH}
mkdir -vp $DEBIAN_BASE/dbdtxt/${SUITE}/${ARCH}
@@ -823,6 +826,7 @@ fi
#
# main - only used in master-mode
#
+exit_early_if_debian_is_broken
check_nodes_are_up
delay_start
choose_package # defines SUITE, PKGID, SRCPACKAGE, SAVE_ARTIFACTS, NOTIFY