[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: move proxy check to maintenance job…

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit ebe3985d952dda3e42f6856726de216b07e64c26
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jun 13 17:21:13 2017 +0200

    reproducible Debian: move proxy check to maintenance job…
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_maintenance.sh       | 15 +++++++++++++++
 bin/reproducible_node_health_check.sh | 10 ----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index e71f3dc..2e01752 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -52,6 +52,21 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 	fi
 fi
 
+#
+# we fail hard
+#
+set +e
+
+#
+# check for working proxy
+#
+echo "$(date -u) - testing whether the proxy works..."
+curl http://www.debian.org > /dev/null
+if [ $? -ne 0 ] ; then
+	echo "Warning: curl http://www.debian.org failed, probably the proxy is down for $HOSTNAME…"
+	DIRTY=true
+fi
+
 echo "$(date -u) - updating the schroots and pbuilder now..."
 # use host architecture (only)
 ARCH=$(dpkg --print-architecture)
diff --git a/bin/reproducible_node_health_check.sh b/bin/reproducible_node_health_check.sh
index 686e035..e4dd61f 100755
--- a/bin/reproducible_node_health_check.sh
+++ b/bin/reproducible_node_health_check.sh
@@ -38,16 +38,6 @@ show_fstab_and_mounts() {
 set +e
 
 #
-# check for working proxy
-#
-echo "$(date -u) - testing whether the proxy works..."
-curl http://www.debian.org > /dev/null
-if [ $? -ne 0 ] ; then
-	echo "Warning: curl http://www.debian.org failed, probably the proxy is down for $HOSTNAME…"
-	DIRTY=true
-fi
-
-#
 # check for /dev/shm being mounted properly
 #
 echo "$(date -u) - testing whether /dev/shm is mounted correctly..."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git