[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: use different workaround for opi2a

[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 50b8c6beae652b41e8f0fdc53d71280abd94d5bd
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Aug 23 12:46:10 2016 +0200

    reproducible Debian: use different workaround for opi2a
---
 update_jdn.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/update_jdn.sh b/update_jdn.sh
index 7bfbce7..f0fe993 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -37,12 +37,6 @@ case $HOSTNAME in
 		sudo service ntp stop
 		sudo ntpdate -b de.pool.ntp.org
 		;;
-	opi2a)
-		# this host is acting strange…
-		# restarting services cause hangs, so we don't do that
-		echo -e "#!/bin/sh\nexit 101" | sudo tee /usr/sbin/policy-rc.d
-		sudo chmod +x /usr/sbin/policy-rc.d
-		;;
 	*)	;;
 esac
 
@@ -506,7 +500,11 @@ if [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] || [ ! -f $STAMP ] ; then
 		for i in apache_accesses apache_volume ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done
 		sudo ln -s /usr/share/munin/plugins/loggrep jenkins_oom
 	fi
-	sudo service munin-node force-reload
+	if [ "$HOSTNAME" != "opi2a" ] ; then
+		# opi2a is strangely broken
+		# so this is just a hackish workaround for that…
+		sudo service munin-node force-reload
+	fi
 fi
 explain "packages configured."
 
@@ -678,11 +676,6 @@ case $HOSTNAME in
 	profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386)
 		sudo date --set="+398 days +6 hours + 23 minutes"
 		;;
-	opi2a)
-		# this host is acting strange…
-		# cleaning up our workaround…
-		sudo rm /usr/sbin/policy-rc.d
-		;;
 	jenkins)
 		# notify irc
 		MESSAGE="jenkins.d.n updated to $(cd $BASEDIR ; git describe --always)."

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