[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] jenkins nodes: bookworm has replaced ntp with ntpsec, so configure that one...

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
06c49544 by Holger Levsen at 2023-06-13T13:50:38+02:00
jenkins nodes: bookworm has replaced ntp with ntpsec, so configure that one correctly (for running in the future..) too

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- hosts/common/etc/rc.local
- update_jdn.sh


Changes:

=====================================
hosts/common/etc/rc.local
=====================================
@@ -14,15 +14,15 @@ set -x
 #
 
 send_back_to_the_future() {
-	# stop ntp
-	service ntp stop || true
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
 	systemctl disable ntp.service || true
+	systemctl disable ntpsec.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
 	systemctl stop ntp.service || true
+	systemctl stop ntpsec.service || true
 	# set correct date
 	if [ -z "$1" ] ; then
 		ntpdate -b de.pool.ntp.org
@@ -90,7 +90,7 @@ case $(hostname) in
 	ionos6*)		send_back_to_the_future ;;
 	ionos15*)		send_back_to_the_future ;;
 	ionos16*)		send_back_to_the_future ;;
-	osuosl2-amd64)	send_back_to_the_future time.osuosl.org;;
+	osuosl2-amd64)		send_back_to_the_future time.osuosl.org;;
 	*)			;;
 esac
 


=====================================
update_jdn.sh
=====================================
@@ -51,7 +51,8 @@ explain() {
 
 set_correct_date() {
 		# set correct date
-		sudo service ntp stop || true
+		sudo service ntp stop || true 	# FIXME: we can probably just use ntpsec everywhere
+		sudo service ntpsec stop || true
 		sudo ntpdate -b $1
 }
 
@@ -76,11 +77,7 @@ fi
 
 # some nodes need special treatment…
 case $HOSTNAME in
-	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386)
-		# set correct date
-		set_correct_date de.pool.ntp.org
-		;;
-	codethink9*|codethink11*|codethink13*|codethink15*)
+	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink9*|codethink11*|codethink13*|codethink15*)
 		# set correct date
 		set_correct_date de.pool.ntp.org
 		;;
@@ -344,7 +341,7 @@ if [ -f /etc/debian_version ] ; then
 			munin-plugins-extra
 			needrestart
 			netcat-traditional
-			ntp
+			ntpsec
 			ntpdate
 			pbuilder
 			pigz 
@@ -613,7 +610,7 @@ if [ -f /etc/debian_version ] ; then
 				mr 
 				mtr-tiny 
 				munin/bullseye-backports
-				ntp 
+				ntpsec
 				obfs4proxy
 				openbios-ppc 
 				openbios-sparc 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/06c49544ecbd7a2d6a2aa8b398bc1b8956cf2e2e

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/06c49544ecbd7a2d6a2aa8b398bc1b8956cf2e2e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20230613/2cebb634/attachment-0001.htm>