[Git][qa/jenkins.debian.net][master] ionos3 has been decommissioned, farewell o/

Holger Levsen (@holger) gitlab at salsa.debian.org
Fri Mar 22 15:09:07 GMT 2024



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


Commits:
45d90990 by Holger Levsen at 2024-03-22T16:08:49+01:00
ionos3 has been decommissioned, farewell o/

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

- - - - -


13 changed files:

- THANKS.head
- TODO
- TODO.infrastructure
- bin/common-functions.sh
- bin/jenkins_node_definitions.sh
- bin/reproducible_html_nodes_info.sh
- bin/reproducible_maintenance.sh
- hosts/ionos10-amd64/etc/squid/squid.conf
- hosts/jenkins/etc/munin/munin.conf
- jenkins-home/offline_nodes
- job-cfg/reproducible.yaml
- nodes/list.yml
- update_jdn.sh


Changes:

=====================================
THANKS.head
=====================================
@@ -17,7 +17,6 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit
  ** 13 cores and 8 GB memory for ionos12-i386.debian.net used for building i386 Debian packages for t.r-b.o
  ** 21 cores and 80 GB memory for ionos15-amd64.debian.net used for building amd64 Debian packages for t.r-b.o, running in the future
  ** 12 cores and 8 GB memory for ionos16-i386.debian.net sed for building i386 Debian packages for t.r-b.o, running in the future
- ** 2 cores and 4 GB memory for ionos3-amd64.debian.net used for our twitterbot.
  ** 2 cores and 8 GB memory for ionos7-amd64.debian.net used for buildinfos.debian.net
  ** 5 cores and 10 GB memory for ionos9-amd64.debian.net used for rebootstrap jobs
  ** 4 cores and 12 GB memory for ionos10-amd64.debian.net used for chroot-installation jobs


=====================================
TODO
=====================================
@@ -35,7 +35,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 
 * rename TODO.trixie to TODO.forky once everything in there has been done
 ** also s#trixie#forky#g and s#bookworm#trixie#g in there, and check for bullseye, buster and stretch too
-* setup ionosXY for janitor (remove ionos3 duplicate first)
 * decouple t.r-b.o from jenkins.d.n (https hosting wise), maybe even www.r-b.o
 * rename jenkins to hudson? (the hostname)
 * maintenance job: 


=====================================
TODO.infrastructure
=====================================
@@ -16,10 +16,8 @@ free sdd space: 1000gb
 ordered todo
 ------------
 fix all FIXMEs and answer all question marks
-shutdown ionos3 at fkb free 2 cores & 24gb ram & 272gb hdd
-shutdown ionos3 at fra free 2 cores & 4gb ram & 150gb sdd
-setup ionos4 as proxy for fkb, needs 2 core, 6gb ram, 128gb hdd (8 swap, 20 system, 100 /var/spool/squid)
-setup ionos14 as proxy for fra, needs 2 core, 6gb ram, 128gb hdd (8 swap, 20 system, 100 /var/spool/squid)
+setup ionos4 as proxy for fkb, needs 2 core, 4gb ram, 128gb hdd (8 swap, 20 system, 100 /var/spool/squid)
+setup ionos14 as proxy for fra, needs 2 core, 4gb ram, 128gb hdd (8 swap, 20 system, 100 /var/spool/squid)
 	or put proxies on sdd?
 shutdown proxies on ionos1 and ionos10, use squid on ionos4+6
 mv jenkins:/dev/mapper/reproducible-userContent to SDD, free 700gb hdd space
@@ -31,7 +29,9 @@ is /srv/workspace on jenkins on tmpfs (with 100gb size) really a good idea, espe
 document codethink out-of-band access
 document infomaniak setup
 add infomanik to THANKS website.git/non-financial-sponsors
-setup new infomanika nodes, FIXME: needs a plan
+setup two infomiaik nodes, as a start
+	infomaniak01: 12 cores, 24gb ram
+	infomaniak02: 12 cores. 24gb ram
 FIXME: r-b needs more amd64 build power. maybe i386 too.
 setup ionos8 as www2.r-b.o
 	reproducible-website.git
@@ -50,7 +50,6 @@ split this on several hosts:
 	osuosl3-amd64: Debian live-builds / Debian bootstrap jobs / debian-janitor / mmdebstrap-jenkins jobs / openqa.d.n workers
 	FIXME: this needs a plan
 point snapshot.r-b.o to rebuilder-snapshot.d.n?
-upload python-ionoscloud to bookworm-backports?
 improve ionos naming scheme so the datacenter becomes visible and whether its running in the future or not?
 	 ionos151 - fkb/5/future
 	 ionos050 - fra/5/today


=====================================
bin/common-functions.sh
=====================================
@@ -129,7 +129,7 @@ else
 		jenkins|ionos1-a*|ionos2*|ionos9*|ionos11*|ionos12*)
 			# IONOS datacenter in karlsruhe uses ionos1 as proxy:
 			export http_proxy="http://78.137.99.97:3128" ;;
-		ionos3*|ionos5*|ionos6*|ionos7*|ionos10*|ionos15*|ionos16*)
+		ionos5*|ionos6*|ionos7*|ionos10*|ionos15*|ionos16*)
 			# IONOS datacenter in frankfurt uses ionos10 as proxy:
 			export http_proxy="http://85.184.249.68:3128" ;;
 		osuosl*)


=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -9,10 +9,10 @@
 #		  where it *must* only contain the Debian nodes as it's used
 #		  to generate the variations… and
 #		- bin/reproducible_cleanup_nodes.sh where it would be
-#		  nice to also include ionos3,7,9+10, to also cleanup
+#		  nice to also include ionos4,7,9,10+14, to also cleanup
 #		  jobs there…
 #	FIXME: this list is also defined in two places:
-#		- as the list below can also be constructed like this: ./nodes/list_nodes |grep -Ev "(rb-mail|jenkins|ionos3|ionos7|ionos9|ionos10|osuosl4|osuosl5)"
+#		- as the list below can also be constructed like this: ./nodes/list_nodes |grep -Ev "(rb-mail|jenkins|ionos4|ionos7|ionos9|ionos10|ionos14|osuosl4|osuosl5)"
 BUILD_NODES="
 cbxi4a-armhf-rb.debian.net
 cbxi4b-armhf-rb.debian.net


=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright © 2015-2023 Holger Levsen <holger at layer-acht.org>
+# Copyright © 2015-2024 Holger Levsen <holger at layer-acht.org>
 #           ©      2018 Mattia Rizzolo <mattia at debian.org>
 # released under the GPLv2
 
@@ -17,7 +17,6 @@ common_init "$@"
 explain_nodes() {
 	case $JENKINS_NODENAME in
 		jenkins)	;;
-		ionos3)		write_page "<br /><small>(twitterbot for irc:#reproducible-builds)</small>" ;;
 		ionos7)		write_page "<br /><small>(buildinfos.debian.net)</small>" ;;
 		ionos9)		write_page "<br /><small>(jenkins.d.n rebootstrap jobs)</small>" ;;
 		ionos10)	write_page "<br /><small>(jenkins.d.n chroot-installation jobs and http-proxy)</small>" ;;
@@ -63,8 +62,8 @@ build_nodes_health_page() {
 		for NODE in $BUILD_NODES ; do
 			REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES $NODE"
 			if [ "$NODE" = "ionos2-i386.debian.net" ] ; then
-				# ionos3	twitterbot
-				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos3-amd64.debian.net"
+				# ionos4	twitterbot
+				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos4-amd64.debian.net"
 			elif [ "$NODE" = "ionos6-i386.debian.net" ] ; then
 				# ionos7	buildinfos.debian.net jobs
 				# ionos9 	rebootstrap jobs
@@ -107,7 +106,6 @@ build_nodes_health_page() {
 			# worker.log links
 			case $JENKINS_NODENAME in
 				jenkins)	write_page "<td></td>" ;;
-				ionos3)		write_page "<td></td>" ;;
 				ionos7)		write_page "<td></td>" ;;
 				ionos9)		write_page "<td></td>" ;;
 				ionos10)	write_page "<td></td>" ;;
@@ -125,7 +123,6 @@ build_nodes_health_page() {
 			for SUITE in ${SUITES} ; do
 				case $JENKINS_NODENAME in
 					jenkins)	write_page "<td></td>" ;;
-					ionos3)		write_page "<td></td>" ;;
 					ionos7)		write_page "<td></td>" ;;
 					ionos9)		write_page "<td></td>" ;;
 					ionos10)	write_page "<td></td>" ;;
@@ -209,7 +206,6 @@ build_graph_overview_pages() {
 					if [ "$GRAPH" = "jenkins_reproducible_builds" ] ; then
 						case $JENKINS_NODENAME in
 							jenkins)	write_page "<td></td>" ; continue ;;
-							ionos3)		write_page "<td></td>" ; continue ;;
 							ionos7)		write_page "<td></td>" ; continue ;;
 							ionos9)		write_page "<td></td>" ; continue ;;
 							ionos10)	write_page "<td></td>" ; continue ;;


=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -598,7 +598,7 @@ for s in $SUITES ; do
 			continue
 		fi
 	fi
-	for i in osuosl ionos3 ionos7 ionos9 ionos10 ; do
+	for i in osuosl ionos4 ionos7 ionos9 ionos10 ionos14; do
 		if [ "${HOSTNAME:0:${#i}}" = "$i" ]; then
 			# this node is not used to do Debian rebuilds, skip it all
 			continue 2


=====================================
hosts/ionos10-amd64/etc/squid/squid.conf
=====================================
@@ -975,7 +975,6 @@
 acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
 #acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
 #acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
-acl localnet src 185.48.119.12/32	# ionos3
 acl localnet src 85.184.249.130/32	# ionos5
 acl localnet src 213.244.192.14/32	# ionos6
 acl localnet src 157.97.110.83/32	# ionos7


=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -144,20 +144,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
-[ionos3-amd64.debian.net]
-    address 185.48.119.12
-    use_node_name yes
-    df._srv_workspace.warning 90
-    df._srv_workspace.critical 95
-    diskstats_latency.vda.avgwrwait.warning 0:20
-    diskstats_latency.vdb.avgwrwait.warning 0:20
-    diskstats_latency.vda.avgrdwait.warning 0:10
-    diskstats_latency.vdb.avgrdwait.warning 0:10
-    diskstats_latency.graph no
-    diskstats_throughput.graph no
-    diskstats_utilization.graph no
-    diskstats_iops.graph no
-
 [ionos5-amd64.debian.net]
     address 85.184.249.130
     use_node_name yes
@@ -537,7 +523,7 @@ contact.me.command mail -s "Munin notification ${var:host}" root
 #       node_order Totals fii.foo.com fay.foo.com
 #
 [debian.net]
-	node_order jenkins.debian.net ionos1-amd64.debian.net ionos2-i386.debian.net ionos3-amd64.debian.net ionos5-amd64.debian.net ionos6-i386.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos12-i386.debian.net ionos15-amd64.debian.net ionos16-i386.debian.net codethink01-arm64.debian.net codethink02-arm64.debian.net codethink03-arm64.debian.net codethink04-arm64.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net virt32a-armhf-rb.debian.net virt32b-armhf-rb.debian.net virt32c-armhf-rb.debian.net virt32z-armhf-rb.debian.net virt64a-armhf-rb.debian.net virt64b-armhf-rb.debian.net virt64c-armhf-rb.debian.net virt64z-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net osuosl1-amd64.debian.net osuosl2-amd64.debian.net osuosl3-amd64.debian.net osuosl4-amd64.debian.net osuosl5-amd64.debian.net
+	node_order jenkins.debian.net ionos1-amd64.debian.net ionos2-i386.debian.net ionos5-amd64.debian.net ionos6-i386.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos12-i386.debian.net ionos15-amd64.debian.net ionos16-i386.debian.net codethink01-arm64.debian.net codethink02-arm64.debian.net codethink03-arm64.debian.net codethink04-arm64.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net virt32a-armhf-rb.debian.net virt32b-armhf-rb.debian.net virt32c-armhf-rb.debian.net virt32z-armhf-rb.debian.net virt64a-armhf-rb.debian.net virt64b-armhf-rb.debian.net virt64c-armhf-rb.debian.net virt64z-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net osuosl1-amd64.debian.net osuosl2-amd64.debian.net osuosl3-amd64.debian.net osuosl4-amd64.debian.net osuosl5-amd64.debian.net
 
 [reproducible-builds.org;]
 	node_order rb-mail1.reproducible-builds.org


=====================================
jenkins-home/offline_nodes
=====================================
@@ -15,8 +15,6 @@
 
 # investigation needed
 
-# most likely pending decommission
-ionos3-amd64.debian.net
 
 # Down here nodes are automatically added by the maintenance job when they have
 # been failing their health check or maintenance job for too long.


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -321,7 +321,6 @@
                 - 'wbq0':           { my_arch: 'armhf' }
                 - 'ionos1':         { my_arch: 'amd64' }
                 - 'ionos2':         { my_arch: 'i386'  }
-                - 'ionos3':         { my_arch: 'amd64' }
                 - 'ionos5':         { my_arch: 'amd64' }
                 - 'ionos6':         { my_arch: 'i386'  }
                 - 'ionos7':         { my_arch: 'amd64' }
@@ -365,7 +364,6 @@
                 - 'wbq0':           { my_arch: 'armhf' }
                 - 'ionos1':         { my_arch: 'amd64' }
                 - 'ionos2':         { my_arch: 'i386'  }
-                - 'ionos3':         { my_arch: 'amd64' }
                 - 'ionos5':         { my_arch: 'amd64' }
                 - 'ionos6':         { my_arch: 'i386'  }
                 - 'ionos7':         { my_arch: 'amd64' }


=====================================
nodes/list.yml
=====================================
@@ -14,10 +14,6 @@
   ip: 46.16.73.166
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFez9q/k1rxbsQ2odoGTvThfyi+TlYTKNagNsjTcQrYA root at ionos2-i386
-- hostname: ionos3-amd64.debian.net
-  ip: 185.48.119.12
-  keys:
-    - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILxgSxHwyUH+XuB7uAGhtU60j9AilWAeHWSTrtw9CVwU root at debian
 - hostname: ionos5-amd64.debian.net
   time: future
   ip: 85.184.249.130


=====================================
update_jdn.sh
=====================================
@@ -105,7 +105,6 @@ user_host_groups['kpcyrd','jenkins']="jenkins"
 #user_host_groups['flx','osuosl3-amd64']="$sudo_groups"
 #user_host_groups['jspricke','osuosl3-amd64']="$sudo_groups"
 user_host_groups['vagrant','*']="$sudo_groups"
-user_host_groups['santiago','ionos3-amd64']="$sudo_groups"
 user_host_groups['fpierret','osuosl4-amd64']="$sudo_groups"
 user_host_groups['fpierret','osuosl5-amd64']="$sudo_groups"
 user_host_groups['rclobus','osuosl3-amd64']="$sudo_groups"



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/45d90990c28a087e5279d9a04d74512cc3c3a65b
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/20240322/79707936/attachment-0001.htm>


More information about the Qa-jenkins-scm mailing list