From 8d7efe71efb50fb9d83573af953cc3f9d2db23e9 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 20 Jun 2016 11:28:10 +0200 Subject: reproducible debian: disable armhf again until #827724 is fixed --- bin/reproducible_build.sh | 24 ++++++++++++++---------- 1 file 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 # 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 -- cgit v1.2.3-70-g09d2