[Git][qa/jenkins.debian.net][master] jenkins nodes: add ionos4+14-amd64 jenkins jobs and to munin

Holger Levsen (@holger) gitlab at salsa.debian.org
Fri Apr 19 22:55:38 BST 2024



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


Commits:
2e3bcbad by Holger Levsen at 2024-04-19T23:55:23+02:00
jenkins nodes: add ionos4+14-amd64 jenkins jobs and to munin

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

- - - - -


5 changed files:

- TODO.infrastructure
- bin/jenkins_node_definitions.sh
- bin/reproducible_html_nodes_info.sh
- hosts/jenkins/etc/munin/munin.conf
- job-cfg/reproducible.yaml


Changes:

=====================================
TODO.infrastructure
=====================================
@@ -19,14 +19,12 @@ amd64 is now often build (i1+5+11+16, but not infom1+2) with cpu variation: once
 turn SSD based swap on ionos1+5+11+15 into hdd based one
 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, needs 2 core, 12gb ram, 152gb hdd (24 swap, rest root fs, allow 100gb for /var/spool/squid)
-setup ionos14 as proxy for fra, needs 2 core, 12gb ram, 152gb hdd (24 swap, rest root fs, allow 100gb for /var/spool/squid)
-	init_node
-	jenkins jobs
-	munin
+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)
+	setup swap
+	setup squid
 	make ionos systems use these proxies and disable to old ones
 	add ionos4+14 to THANKS
-	add ionos4+14 to node info page
 shutdown proxies on ionos1 and ionos10, use squid on ionos4+6
 mv jenkins:/dev/vda1 to SDD, free 500gb hdd space
 	increase to 640gb? more partitions?


=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -25,10 +25,12 @@ 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
=====================================
@@ -25,6 +25,7 @@ explain_nodes() {
 		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>" ;;
 		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>" ;;
 		*)		write_page "<br /><small>(r-b Debian builds)</small>" ;;
 	esac
 }
@@ -62,13 +63,14 @@ build_nodes_health_page() {
 		for NODE in $BUILD_NODES ; do
 			REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES $NODE"
 			if [ "$NODE" = "ionos2-i386.debian.net" ] ; then
-				# ionos4	twitterbot
+				# ionos4	squid
 				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos4-amd64.debian.net"
 			elif [ "$NODE" = "ionos6-i386.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"
+				# ionos14	squid
 			fi
 		done
 		for NODE in $REPRODUCIBLE_NODES ; do


=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -144,6 +144,14 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
+[ionos4-amd64.debian.net]
+    address 46.16.76.132
+    use_node_name yes
+    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
@@ -242,6 +250,14 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
+[ionos14-amd64.debian.net]
+    address 213.165.73.152
+    use_node_name yes
+    diskstats_latency.graph no
+    diskstats_throughput.graph no
+    diskstats_utilization.graph no
+    diskstats_iops.graph no
+
 [ionos15-amd64.debian.net]
     address 157.97.110.46
     use_node_name yes
@@ -531,7 +547,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 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 infom01-amd64.debian.net infom02-amd64.debian.net
+	node_order jenkins.debian.net ionos1-amd64.debian.net ionos2-i386.debian.net ionos4-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 ionos14-amd64.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 infom01-amd64.debian.net infom02-amd64.debian.net
 
 [reproducible-builds.org;]
 	node_order rb-mail1.reproducible-builds.org


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -321,6 +321,7 @@
                 - 'wbq0':           { my_arch: 'armhf' }
                 - 'ionos1':         { my_arch: 'amd64' }
                 - 'ionos2':         { my_arch: 'i386'  }
+                - 'ionos4':         { my_arch: 'amd64' }
                 - 'ionos5':         { my_arch: 'amd64' }
                 - 'ionos6':         { my_arch: 'i386'  }
                 - 'ionos7':         { my_arch: 'amd64' }
@@ -328,6 +329,7 @@
                 - 'ionos10':        { my_arch: 'amd64' }
                 - 'ionos11':        { my_arch: 'amd64' }
                 - 'ionos12':        { my_arch: 'i386'  }
+                - 'ionos14':        { my_arch: 'amd64' }
                 - 'ionos15':        { my_arch: 'amd64' }
                 - 'ionos16':        { my_arch: 'i386'  }
                 - 'osuosl1':        { my_arch: 'amd64' }
@@ -366,6 +368,7 @@
                 - 'wbq0':           { my_arch: 'armhf' }
                 - 'ionos1':         { my_arch: 'amd64' }
                 - 'ionos2':         { my_arch: 'i386'  }
+                - 'ionos4':         { my_arch: 'amd64' }
                 - 'ionos5':         { my_arch: 'amd64' }
                 - 'ionos6':         { my_arch: 'i386'  }
                 - 'ionos7':         { my_arch: 'amd64' }
@@ -373,6 +376,7 @@
                 - 'ionos10':        { my_arch: 'amd64' }
                 - 'ionos11':        { my_arch: 'amd64' }
                 - 'ionos12':        { my_arch: 'i386'  }
+                - 'ionos14':        { my_arch: 'amd64' }
                 - 'ionos15':        { my_arch: 'amd64' }
                 - 'ionos16':        { my_arch: 'i386'  }
                 - 'osuosl1':        { my_arch: 'amd64' }
@@ -422,10 +426,12 @@
                 - 'wbq0':           { my_arch: 'armhf' }
                 - 'ionos1':         { my_arch: 'amd64' }
                 - 'ionos2':         { my_arch: 'i386'  }
+                - 'ionos4':         { my_arch: 'amd64' }
                 - 'ionos5':         { my_arch: 'amd64' }
                 - 'ionos6':         { my_arch: 'i386'  }
                 - 'ionos11':        { my_arch: 'amd64' }
                 - 'ionos12':        { my_arch: 'i386'  }
+                - 'ionos14':        { my_arch: 'amd64' }
                 - 'ionos15':        { my_arch: 'amd64' }
                 - 'ionos16':        { my_arch: 'i386'  }
                 - 'codethink01':    { my_arch: 'arm64' }



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2e3bcbada803f6be612d40755e6bb5d4f92c629d
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/20240419/1fd40043/attachment-0001.htm>


More information about the Qa-jenkins-scm mailing list