[Qa-jenkins-scm] [jenkins.debian.net] 01/01: force fix ntp

[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 8adab9bb7f5cbb80a655443a37ee7d3390f2a877
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jul 24 11:51:27 2016 -0400

    force fix ntp
---
 hosts/profitbricks-build5-amd64/etc/rc.local | 2 ++
 hosts/profitbricks-build6-i386/etc/rc.local  | 2 ++
 update_jdn.sh                                | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hosts/profitbricks-build5-amd64/etc/rc.local b/hosts/profitbricks-build5-amd64/etc/rc.local
index 59131fc..b3a760e 100755
--- a/hosts/profitbricks-build5-amd64/etc/rc.local
+++ b/hosts/profitbricks-build5-amd64/etc/rc.local
@@ -13,6 +13,8 @@
 
 echo "$(date -u) - system was rebooted" | mail -s "$(hostname -f) rebooted" root
 
+# stop ntp
+service ntp stop || true
 # disable systemd date services (and don't fail if systemd ain't running)
 systemctl disable systemd-timesyncd
 systemctl disable systemd-timedated
diff --git a/hosts/profitbricks-build6-i386/etc/rc.local b/hosts/profitbricks-build6-i386/etc/rc.local
index 59131fc..b3a760e 100755
--- a/hosts/profitbricks-build6-i386/etc/rc.local
+++ b/hosts/profitbricks-build6-i386/etc/rc.local
@@ -13,6 +13,8 @@
 
 echo "$(date -u) - system was rebooted" | mail -s "$(hostname -f) rebooted" root
 
+# stop ntp
+service ntp stop || true
 # disable systemd date services (and don't fail if systemd ain't running)
 systemctl disable systemd-timesyncd
 systemctl disable systemd-timedated
diff --git a/update_jdn.sh b/update_jdn.sh
index 0726068..7a03540 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -33,8 +33,9 @@ explain "$(date) - begin deployment update."
 # run update at current date
 case $HOSTNAME in
 	profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386)
-		# set correct date (if ntpdate is installed)
-		[ ! -f /usr/sbin/ntpdate ] || sudo ntpdate -b de.pool.ntp.org
+		# set correct date
+		sudo service ntp stop
+		sudo ntpdate -b de.pool.ntp.org
 		;;
 	*)	;;
 esac

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