[Git][qa/jenkins.debian.net][master] jenkins nodes: fixup node health page for new ionos4+14 nodes (and osuosl4+5 too)

[Holger Levsen (@holger)]

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


Commits:
09fccba3 by Holger Levsen at 2024-04-20T21:09:38+02:00
jenkins nodes: fixup node health page for new ionos4+14 nodes (and osuosl4+5 too)

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

- - - - -


3 changed files:

- TODO.infrastructure
- bin/jenkins_node_definitions.sh
- bin/reproducible_html_nodes_info.sh


Changes:

=====================================
TODO.infrastructure
=====================================
@@ -21,6 +21,7 @@ check /srv/workspace (tmpfs or not) on all ionos nodes and all nodes in general
 	also, our pbuilderc is setup to only use eatmydata on armhf+i386 - because amd64+arm64 build on tmpfs anyway (which is not true anymore...)
 setup ionos4 as proxy for fkb, has 2 cores, 12gb ram, 152gb hdd (24 swap, rest root fs, allow 100gb for /var/spool/squid)
 setup ionos14 as proxy for fra, has 2 cores, 12gb ram, 152gb hdd (24 swap, rest root fs, allow 100gb for /var/spool/squid)
+	fixup index_nodes_health
 	setup swap
 	setup squid
 	make ionos systems use these proxies and disable to old ones


=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -25,12 +25,10 @@ ff4a-armhf-rb.debian.net
 ff64a-armhf-rb.debian.net
 ionos1-amd64.debian.net
 ionos2-i386.debian.net
-ionos4-amd64.debian.net
 ionos5-amd64.debian.net
 ionos6-i386.debian.net
 ionos11-amd64.debian.net
 ionos12-i386.debian.net
-ionos14-amd64.debian.net
 ionos15-amd64.debian.net
 ionos16-i386.debian.net
 virt32a-armhf-rb.debian.net


=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -23,6 +23,8 @@ explain_nodes() {
 		osuosl1)	write_page "<br /><small>(r-b Alpine, Archlinux, Coreboot, NetBSD, OpenWrt builds)</small>" ;;
 		osuosl2)	write_page "<br /><small>(r-b Alpine, Archlinux, Coreboot, OpenWrt builds)</small>" ;;
 		osuosl3)	write_page "<br /><small>(r-b Debian live-build / bootstrap jobs and Debian janitor jobs, mmdebstrap-jenkins jobs and openqa.d.n workers</small>" ;;
+		osuosl4)	write_page "<br /><small>(r-b snapshot development)</small>" ;;
+		osuosl5)	write_page "<br /><small>(r-b rebuilder-snapshot.debian.net)</small>" ;;
 		ionos1)		write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
 		codethink04)	write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
 		ionos*4)	write_page "<br /><small>(r-b http(s) proxy)</small>" ;;
@@ -65,12 +67,18 @@ build_nodes_health_page() {
 			if [ "$NODE" = "ionos2-i386.debian.net" ] ; then
 				# ionos4	squid
 				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos4-amd64.debian.net"
-			elif [ "$NODE" = "ionos6-i386.debian.net" ] ; then
+			elif [ "$NODE" = "ionos5-amd64.debian.net" ] ; then
 				# ionos7	buildinfos.debian.net jobs
 				# ionos9 	rebootstrap jobs
 				# ionos10	chroot jobs
 				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net"
+			elif [ "$NODE" = "ionos11-amd64.debian.net" ] ; then
 				# ionos14	squid
+				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos14-amd64.debian.net"
+			elif [ "$NODE" = "osuosl3-amd64.debian.net" ] ; then
+				# osuosl4
+				# osuosl5
+				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES osuosl4-amd64.debian.net osuosl5-amd64.debian.net"
 			fi
 		done
 		for NODE in $REPRODUCIBLE_NODES ; do
@@ -125,9 +133,11 @@ build_nodes_health_page() {
 			for SUITE in ${SUITES} ; do
 				case $JENKINS_NODENAME in
 					jenkins)	write_page "<td></td>" ;;
+					ionos4)		write_page "<td></td>" ;;
 					ionos7)		write_page "<td></td>" ;;
 					ionos9)		write_page "<td></td>" ;;
 					ionos10)	write_page "<td></td>" ;;
+					ionos14)	write_page "<td></td>" ;;
 					osuosl*)	write_page "<td></td>" ;;
 					*)		URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_pbuilder_${SUITE}_${ARCH}_${JENKINS_NODENAME}"
 							BADGE="$URL/badge/icon"



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/09fccba3915c778c8bcbe7462f436337aa5eb085
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/20240420/61037851/attachment-0001.htm>