reproducible Debian: rename codethink-sledX-arm64 nodes to codethinkX-arm64 (2nd batch)

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

README

@@ -132,7 +132,7 @@ Installation tests inside chroot environments.
 * These builds on remote nodes run on very different hardware:
 ** for 'amd64' we are using four virtual machines, ionos(1+5+11+15)-amd64, which have 15 or 16 cores and 48gb ram each. These nodes are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[IONOS].
 ** for 'i386' we are also using four virtual machines, ionos(2+6+12+16)-i386, which have 10 or 9 cores and 36gb ram each. ionos2+12 run emulated AMD Opteron CPUs and ionos6+16 Intel Xeon CPUs. These nodes are also sponsored by link:https://jenkins.debian.net/userContent/thanks.html[IONOS].
-** for 'arm64' we are using eight "moonshot" sleds, codethink-sled9-15-arm64, which have 8 cores and 64gb ram each. These nodes are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Codethink].
+** for 'arm64' we are using eight "moonshot" sleds, codethink9-15-arm64, which have 8 cores and 64gb ram each. These nodes are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Codethink].
 ** To test 'armhf' we are using 22 small boards hosted by vagrant@d.o:
 *** six quad-cores (cbxi4a, cbxi4b, ff4a, jtx1a, jtx1b, jtx1c) with 4gb ram,
 *** one hexa-core (ff64a) with 4gb ram,

THANKS.head

@@ -33,14 +33,14 @@ Debian packages for t.r-b.o
  ** two quad-cores with 1 GB RAM and
  ** three dual-cores with 1 GB RAM.
  * In December 2016 link:https://codethink.co.uk[Codethink] has kindly offered access to 8 arm64 build nodes on link:http://www8.hp.com/us/en/hp-news/press-release.html?id=1800094#.VgQdelox1QI[HP moonshot hardware].
- ** 8 cores and 64 GB memory for codethink-sled9-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
- ** 8 cores and 64 GB memory for codethink-sled10-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
- ** 8 cores and 64 GB memory for codethink-sled11-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
- ** 8 cores and 64 GB memory for codethink-sled12-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
- ** 8 cores and 64 GB memory for codethink-sled13-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
- ** 8 cores and 64 GB memory for codethink-sled14-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
- ** 8 cores and 64 GB memory for codethink-sled15-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
- ** 8 cores and 64 GB memory for codethink-sled16-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
+ ** 8 cores and 64 GB memory for codethink9-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
+ ** 8 cores and 64 GB memory for codethink10-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
+ ** 8 cores and 64 GB memory for codethink11-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
+ ** 8 cores and 64 GB memory for codethink12-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
+ ** 8 cores and 64 GB memory for codethink13-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
+ ** 8 cores and 64 GB memory for codethink14-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
+ ** 8 cores and 64 GB memory for codethink15-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
+ ** 8 cores and 64 GB memory for codethink16-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
  * link:https://letsencrypt.org[Let's encrypt] provides free of charge SSL certificates for jenkins.debian.net, reproducible.debian.net and tests.reproducible-builds.org.
  * In December 2018 we were given access to eight nodes which were donated by Facebook to the GCC Compile Farm project and are now hosted by link:https://osuosl.org/[OSUOSL]:
   ** 32 cores with 144 GB memory for osuosl167-amd64.debian.net

bin/bring_back_node.sh

@@ -17,7 +17,7 @@ for shortname in $SHORTNAMES ; do
 							node=ionos$i-amd64.debian.net
 							;;
 		ct*)					i=$(echo $shortname | sed 's#ct##')
-							node=codethink-sled$i-arm64.debian.net
+							node=codethink$i-arm64.debian.net
 							;;
 		*)					echo unsupported, please improve this script
 							exit 1

bin/jenkins_node_definitions.sh

@@ -16,14 +16,14 @@ cb3a-armhf-rb.debian.net
 cbxi4a-armhf-rb.debian.net
 cbxi4b-armhf-rb.debian.net
 cbxi4pro0-armhf-rb.debian.net
-codethink-sled9-arm64.debian.net
-codethink-sled10-arm64.debian.net
-codethink-sled11-arm64.debian.net
-codethink-sled12-arm64.debian.net
-codethink-sled13-arm64.debian.net
-codethink-sled14-arm64.debian.net
-codethink-sled15-arm64.debian.net
-codethink-sled16-arm64.debian.net
+codethink9-arm64.debian.net
+codethink10-arm64.debian.net
+codethink11-arm64.debian.net
+codethink12-arm64.debian.net
+codethink13-arm64.debian.net
+codethink14-arm64.debian.net
+codethink15-arm64.debian.net
+codethink16-arm64.debian.net
 ff2a-armhf-rb.debian.net
 ff2b-armhf-rb.debian.net
 ff4a-armhf-rb.debian.net
@@ -65,16 +65,16 @@ get_node_information() {
 	  ionos[56]*|ionos1[56]*)
 	    NODE_RUN_IN_THE_FUTURE=true
 	    ;;
-	  codethink-sled9*)
+	  codethink9*)
 	    NODE_RUN_IN_THE_FUTURE=true
 	    ;;
-	  codethink-sled11*)
+	  codethink11*)
 	    NODE_RUN_IN_THE_FUTURE=true
 	    ;;
-	  codethink-sled13*)
+	  codethink13*)
 	    NODE_RUN_IN_THE_FUTURE=true
 	    ;;
-	  codethink-sled15*)
+	  codethink15*)
 	    NODE_RUN_IN_THE_FUTURE=true
 	    ;;
 	  osuosl-build170*)

bin/reproducible_build_service.sh

@@ -88,38 +88,38 @@ choose_nodes() {
 		i386_24)	NODE1=ionos16-i386	NODE2=ionos12-i386 ;;
 
 		# arm64
-		arm64_1)	NODE1=codethink-sled9-arm64	NODE2=codethink-sled10-arm64 ;;
-		arm64_2)	NODE1=codethink-sled9-arm64	NODE2=codethink-sled12-arm64 ;;
-		arm64_3)	NODE1=codethink-sled9-arm64	NODE2=codethink-sled14-arm64 ;;
-		arm64_4)	NODE1=codethink-sled9-arm64	NODE2=codethink-sled16-arm64 ;;
-		arm64_5)	NODE1=codethink-sled10-arm64	NODE2=codethink-sled9-arm64 ;;
-		arm64_6)	NODE1=codethink-sled10-arm64	NODE2=codethink-sled11-arm64 ;;
-		arm64_7)	NODE1=codethink-sled10-arm64	NODE2=codethink-sled13-arm64 ;;
-		arm64_8)	NODE1=codethink-sled10-arm64	NODE2=codethink-sled15-arm64 ;;
-		arm64_9)	NODE1=codethink-sled11-arm64	NODE2=codethink-sled10-arm64 ;;
-		arm64_10)	NODE1=codethink-sled11-arm64	NODE2=codethink-sled12-arm64 ;;
-		arm64_11)	NODE1=codethink-sled11-arm64	NODE2=codethink-sled14-arm64 ;;
-		arm64_12)	NODE1=codethink-sled11-arm64	NODE2=codethink-sled16-arm64 ;;
-		arm64_13)	NODE1=codethink-sled12-arm64	NODE2=codethink-sled9-arm64 ;;
-		arm64_14)	NODE1=codethink-sled12-arm64	NODE2=codethink-sled11-arm64 ;;
-		arm64_15)	NODE1=codethink-sled12-arm64	NODE2=codethink-sled13-arm64 ;;
-		arm64_16)	NODE1=codethink-sled12-arm64	NODE2=codethink-sled15-arm64 ;;
-		arm64_17)	NODE1=codethink-sled13-arm64	NODE2=codethink-sled10-arm64 ;;
-		arm64_18)	NODE1=codethink-sled13-arm64	NODE2=codethink-sled12-arm64 ;;
-		arm64_19)	NODE1=codethink-sled13-arm64	NODE2=codethink-sled14-arm64 ;;
-		arm64_20)	NODE1=codethink-sled13-arm64	NODE2=codethink-sled16-arm64 ;;
-		arm64_21)	NODE1=codethink-sled14-arm64	NODE2=codethink-sled9-arm64 ;;
-		arm64_22)	NODE1=codethink-sled14-arm64	NODE2=codethink-sled11-arm64 ;;
-		arm64_23)	NODE1=codethink-sled14-arm64	NODE2=codethink-sled13-arm64 ;;
-		arm64_24)	NODE1=codethink-sled14-arm64	NODE2=codethink-sled15-arm64 ;;
-		arm64_25)	NODE1=codethink-sled15-arm64	NODE2=codethink-sled10-arm64 ;;
-		arm64_26)	NODE1=codethink-sled15-arm64	NODE2=codethink-sled12-arm64 ;;
-		arm64_27)	NODE1=codethink-sled15-arm64	NODE2=codethink-sled14-arm64 ;;
-		arm64_28)	NODE1=codethink-sled15-arm64	NODE2=codethink-sled16-arm64 ;;
-		arm64_29)	NODE1=codethink-sled16-arm64	NODE2=codethink-sled9-arm64 ;;
-		arm64_30)	NODE1=codethink-sled16-arm64	NODE2=codethink-sled11-arm64 ;;
-		arm64_31)	NODE1=codethink-sled16-arm64	NODE2=codethink-sled13-arm64 ;;
-		arm64_32)	NODE1=codethink-sled16-arm64	NODE2=codethink-sled15-arm64 ;;
+		arm64_1)	NODE1=codethink9-arm64	NODE2=codethink10-arm64 ;;
+		arm64_2)	NODE1=codethink9-arm64	NODE2=codethink12-arm64 ;;
+		arm64_3)	NODE1=codethink9-arm64	NODE2=codethink14-arm64 ;;
+		arm64_4)	NODE1=codethink9-arm64	NODE2=codethink16-arm64 ;;
+		arm64_5)	NODE1=codethink10-arm64	NODE2=codethink9-arm64 ;;
+		arm64_6)	NODE1=codethink10-arm64	NODE2=codethink11-arm64 ;;
+		arm64_7)	NODE1=codethink10-arm64	NODE2=codethink13-arm64 ;;
+		arm64_8)	NODE1=codethink10-arm64	NODE2=codethink15-arm64 ;;
+		arm64_9)	NODE1=codethink11-arm64	NODE2=codethink10-arm64 ;;
+		arm64_10)	NODE1=codethink11-arm64	NODE2=codethink12-arm64 ;;
+		arm64_11)	NODE1=codethink11-arm64	NODE2=codethink14-arm64 ;;
+		arm64_12)	NODE1=codethink11-arm64	NODE2=codethink16-arm64 ;;
+		arm64_13)	NODE1=codethink12-arm64	NODE2=codethink9-arm64 ;;
+		arm64_14)	NODE1=codethink12-arm64	NODE2=codethink11-arm64 ;;
+		arm64_15)	NODE1=codethink12-arm64	NODE2=codethink13-arm64 ;;
+		arm64_16)	NODE1=codethink12-arm64	NODE2=codethink15-arm64 ;;
+		arm64_17)	NODE1=codethink13-arm64	NODE2=codethink10-arm64 ;;
+		arm64_18)	NODE1=codethink13-arm64	NODE2=codethink12-arm64 ;;
+		arm64_19)	NODE1=codethink13-arm64	NODE2=codethink14-arm64 ;;
+		arm64_20)	NODE1=codethink13-arm64	NODE2=codethink16-arm64 ;;
+		arm64_21)	NODE1=codethink14-arm64	NODE2=codethink9-arm64 ;;
+		arm64_22)	NODE1=codethink14-arm64	NODE2=codethink11-arm64 ;;
+		arm64_23)	NODE1=codethink14-arm64	NODE2=codethink13-arm64 ;;
+		arm64_24)	NODE1=codethink14-arm64	NODE2=codethink15-arm64 ;;
+		arm64_25)	NODE1=codethink15-arm64	NODE2=codethink10-arm64 ;;
+		arm64_26)	NODE1=codethink15-arm64	NODE2=codethink12-arm64 ;;
+		arm64_27)	NODE1=codethink15-arm64	NODE2=codethink14-arm64 ;;
+		arm64_28)	NODE1=codethink15-arm64	NODE2=codethink16-arm64 ;;
+		arm64_29)	NODE1=codethink16-arm64	NODE2=codethink9-arm64 ;;
+		arm64_30)	NODE1=codethink16-arm64	NODE2=codethink11-arm64 ;;
+		arm64_31)	NODE1=codethink16-arm64	NODE2=codethink13-arm64 ;;
+		arm64_32)	NODE1=codethink16-arm64	NODE2=codethink15-arm64 ;;
 		# to choose new armhf jobs:
             #   for i in cb3a bbx15 cbxi4pro0 ff2a ff2b ff64a jtk1a jtk1b odxu4a odxu4b odu3a opi2a opi2c p64b p64c wbq0 cbxi4a cbxi4b ff4a jtx1a jtx1b jtx1c; do echo "$i: " ; grep NODE1 bin/reproducible_build_service.sh|grep armhf|grep $i-armhf ; done
 	        #       6 jobs for quad-cores with 4 gb ram

bin/reproducible_maintenance.sh

@@ -194,7 +194,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 					osuosl*)	NODE="osuosl-build${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
 				esac ;;
 			i386)	NODE="$NODE_ALIAS-i386.debian.net" ;;
-			arm64)	NODE="codethink-sled${NODE_ALIAS#codethink}-arm64.debian.net" ;;
+			arm64)	NODE="codethink${NODE_ALIAS#codethink}-arm64.debian.net" ;;
 			armhf)	NODE="${NODE_ALIAS}-armhf-rb.debian.net" ;;
 		esac
 		case "$NODE" in

bin/reproducible_system_health.sh

@@ -92,7 +92,7 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
 			;;
 	esac
 	if $REMOTE ; then
-		# the dns names are dinfferent than the jenkins names...
+		# the dns names are different than the jenkins names...
 		case $NODE_ARCH in
 			amd64)
 				case "$NODE_ALIAS" in
@@ -100,8 +100,8 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
 					osuosl*)	NODE="osuosl-build${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
 				esac ;;
 			i386)	NODE="$NODE_ALIAS-i386.debian.net" ;;
-			arm64)	NODE="codethink-sled${NODE_ALIAS#codethink}-arm64.debian.net" ;;
-			armhf)	NODE="${NODE_ALIAS}-armhf-rb.debian.net" ;;
+			arm64)	NODE="$NODE_ALIAS-arm64.debian.net" ;;
+			armhf)	NODE="$NODE_ALIAS-armhf-rb.debian.net" ;;
 		esac
 		# ignore jobs on known bad nodes:
 		# check the offline list from git (and the one updated by jenkins)

deploy_jdn

@@ -23,7 +23,7 @@
 # ./deploy_jdn jenkins		- deploy on jenkins only
 # ./deploy_jdn jenkins ionos10	- deploy on jenkins and ionos10
 # ./deploy_jdn jenkins o167	- deploy on jenkins and osuosl167
-# ./deploy_jdn jenkins c9	- deploy on jenkins and codethink-sled9
+# ./deploy_jdn jenkins c9	- deploy on jenkins and codethink9
 # ./deploy_jdn jenkins 10	- deploy on jenkins and ionos10
 # ./deploy_jdn jenkins 5 6	- deploy on jenkins and ionos6 and ionos6
 # ./deploy_jdn jenkins amd64	- deploy on jenkins and all amd64 nodes
@@ -44,7 +44,7 @@ ALL_HOSTS=("${HOSTS[@]}")
 node_in_the_future () {
 	case "$1" in
 		ionos5-amd64*|ionos6-i386*|ionos15-amd64*|ionos16-i386*) true ;;
-		codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*) true ;;
+		codethink9*|codethink11*|codethink13*|codethink15*) true ;;
 		osuosl-build170*|osuosl-build172*) true ;;
 		*) false ;;
 	esac
@@ -123,14 +123,14 @@ elif [ "$1" = "jenkins" ] ; then
 			o172)		HOSTS+=(osuosl-build172-amd64.debian.net) ;;
 			o173)		HOSTS+=(osuosl-build173-amd64.debian.net) ;;
 			o174)		HOSTS+=(osuosl-build174-amd64.debian.net) ;;
-			c9|cs9)		HOSTS+=(codethink-sled9-arm64.debian.net) ;;
-			c10|cs10)	HOSTS+=(codethink-sled10-arm64.debian.net) ;;
-			c11|cs11)	HOSTS+=(codethink-sled11-arm64.debian.net) ;;
-			c12|cs12)	HOSTS+=(codethink-sled12-arm64.debian.net) ;;
-			c13|cs13)	HOSTS+=(codethink-sled13-arm64.debian.net) ;;
-			c14|cs14)	HOSTS+=(codethink-sled14-arm64.debian.net) ;;
-			c15|cs15)	HOSTS+=(codethink-sled15-arm64.debian.net) ;;
-			c16|cs16)	HOSTS+=(codethink-sled16-arm64.debian.net) ;;
+			c9|ct9)		HOSTS+=(codethink9-arm64.debian.net) ;;
+			c10|ct10)	HOSTS+=(codethink10-arm64.debian.net) ;;
+			c11|ct11)	HOSTS+=(codethink11-arm64.debian.net) ;;
+			c12|ct12)	HOSTS+=(codethink12-arm64.debian.net) ;;
+			c13|ct13)	HOSTS+=(codethink13-arm64.debian.net) ;;
+			c14|ct14)	HOSTS+=(codethink14-arm64.debian.net) ;;
+			c15|ct15)	HOSTS+=(codethink15-arm64.debian.net) ;;
+			c16|ct16)	HOSTS+=(codethink16-arm64.debian.net) ;;
 			armhf|amd64|i386|arm64)	 HOSTS+=($(echo "${ALL_HOSTS[@]}" | sed -e 's# #\n#g' | grep "$i")) ;;
 			*) 	if ping -c 1 "$i" ; then HOSTS+=("$i") ; fi ;;
 		esac

jenkins-home/offline_nodes

@@ -4,7 +4,7 @@
 #
 # The code greps for the hostname, i.e.
 # foobar-armhf-rb.debian.net
-# codethink-sled23-arm64.debian.net
+# codethink23-arm64.debian.net
 # ionos42-amd64.debian.net
 # osuosl-build123-amd64.debian.net
 #

nodes/list.yml

@@ -98,42 +98,42 @@
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtj8tDmRAoZUBum1GqPupVSq1hhjtt0V8SL9zOxassT root@gcc174
 
 # arm64
-- hostname: codethink-sled9-arm64.debian.net
+- hostname: codethink9-arm64.debian.net
   ip: 78.40.148.164
   port: 10109
   keys:
-    - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIWSbi27ipvqgA0JdC1nwoYhg8p/Toq5cJXSmUyHwsbj root@codethink-sled9-arm64
-- hostname: codethink-sled10-arm64.debian.net
+    - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIWSbi27ipvqgA0JdC1nwoYhg8p/Toq5cJXSmUyHwsbj root@codethink9-arm64
+- hostname: codethink10-arm64.debian.net
   ip: 78.40.148.164
   port: 10110
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGZ90P6Iot+AHEx/+8AGFKYlYHzcWFikmI37gUvaG3Gk root@sled10
-- hostname: codethink-sled11-arm64.debian.net
+- hostname: codethink11-arm64.debian.net
   ip: 78.40.148.164
   port: 10111
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAJJ8fvhFeE7ePVNmjqN7wwfQ3tswAbs9rqDRxd5tXb root@sled11
-- hostname: codethink-sled12-arm64.debian.net
+- hostname: codethink12-arm64.debian.net
   ip: 78.40.148.164
   port: 10112
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL5aPBK8SPG8Qs3PronNtvpbB+4izRz8qPaY7+dCkBZY root@sled12
-- hostname: codethink-sled13-arm64.debian.net
+- hostname: codethink13-arm64.debian.net
   ip: 78.40.148.164
   port: 10113
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnHniDoWxNiZV8qtyfOPNFoXRK+GhYisLP8hCJu5ryS root@sled13
-- hostname: codethink-sled14-arm64.debian.net
+- hostname: codethink14-arm64.debian.net
   ip: 78.40.148.164
   port: 10114
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIL6oZI38HeglW+3gEkLr0FXfVApVRkBK+bDms68KwAc root@sled14
-- hostname: codethink-sled15-arm64.debian.net
+- hostname: codethink15-arm64.debian.net
   ip: 78.40.148.164
   port: 10115
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7XShDEh0j2LhUzjbtR9hHXrsKzi0Yx86UrtPdoQc+m root@sled15
-- hostname: codethink-sled16-arm64.debian.net
+- hostname: codethink16-arm64.debian.net
   ip: 78.40.148.164
   port: 10116
   keys:

update_jdn.sh

@@ -79,7 +79,7 @@ case $HOSTNAME in
 		# set correct date
 		set_correct_date de.pool.ntp.org
 		;;
-	codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*)
+	codethink9*|codethink11*|codethink13*|codethink15*)
 		# set correct date
 		set_correct_date de.pool.ntp.org
 		;;
@@ -92,7 +92,7 @@ esac
 
 # ubuntu decided to change kernel perms in the middle of LTS…
 case $HOSTNAME in
-	codethink-sled*)
+	codethink*)
 		# fixup perms
 		sudo chmod +r /boot/vmlinuz-*
 		;;
@@ -359,7 +359,7 @@ if [ -f /etc/debian_version ] ; then
 		esac
 		# install squid / apache2 on a few nodes only
 		case $HOSTNAME in
-			ionos1-a*|ionos10*|codethink-sled16*|osuosl-build*) DEBS="$DEBS
+			ionos1-a*|ionos10*|codethink16*|osuosl-build*) DEBS="$DEBS
 				squid" ;;
 			ionos7-a*) DEBS="$DEBS
 				dehydrated
@@ -418,7 +418,7 @@ if [ -f /etc/debian_version ] ; then
 		# needed to run the 2nd reproducible builds nodes in the future...
 		case $HOSTNAME in
 			ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386) DEBS="$DEBS ntpdate" ;;
-			codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*) DEBS="$DEBS ntpdate" ;;
+			codethink9*|codethink11*|codethink13*|codethink15*) DEBS="$DEBS ntpdate" ;;
 			osuosl-build170-amd64|osuosl-build172-amd64) DEBS="$DEBS ntpdate" ;;
 			*) ;;
 		esac
@@ -698,7 +698,7 @@ if ! $UP2DATE || [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] ; then
 	cd /etc/munin/plugins
 	sudo rm -f postfix_* open_inodes interrupts irqstats threads proc_pri vmstat if_err_* exim_* netstat fw_forwarded_local fw_packets forks open_files users nfs* iostat_ios ntp* df_abs 2>/dev/null
 	case $HOSTNAME in
-			ionos1-a*|ionos10*|codethink-sled16*|osuosl-build*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
+			ionos1-a*|ionos10*|codethink16*|osuosl-build*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
 			*)	;;
 	esac
 	case $HOSTNAME in
@@ -909,7 +909,7 @@ case $HOSTNAME in
 		disable_dsa_check_packages
 		sudo date --set="+398 days +6 hours + 23 minutes"
 		;;
-	codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*)
+	codethink9*|codethink11*|codethink13*|codethink15*)
 		disable_dsa_check_packages
 		sudo date --set="+398 days +6 hours + 23 minutes"
 		;;