[Git][qa/jenkins.debian.net][master] reproducible Debian: configure two new nodes at infomanik.cloud: infom07-i386 and infom08-i386

Holger Levsen (@holger) gitlab at salsa.debian.org
Wed Apr 24 18:47:05 BST 2024



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


Commits:
cc1ed006 by Holger Levsen at 2024-04-24T19:46:31+02:00
reproducible Debian: configure two new nodes at infomanik.cloud: infom07-i386 and infom08-i386

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

- - - - -


11 changed files:

- README.infrastructure
- THANKS.head
- TODO.infrastructure
- bin/djm
- bin/jenkins_node_definitions.sh
- hosts/common/etc/pbuilderrc
- hosts/common/etc/rc.local
- hosts/jenkins/etc/munin/munin.conf
- job-cfg/reproducible.yaml
- nodes/list.yml
- update_jdn.sh


Changes:

=====================================
README.infrastructure
=====================================
@@ -38,7 +38,7 @@ as PTR records for them.  IONOS asked us to inform them (support at cloud.ionos.com
 at some point we will decommission them and the reserved IPs won't be needed anymore, so they
 can remove the PTR records and unblock the IP addresses.
 
-==== nodes at osuosl.org
+==== amd64 nodes at osuosl.org
 
 We also have 5 nodes running at osuosl.org. Contact via #osuosl on freenode or mail to 
 support at osuosl.org mentioning the machine name in the subject. The nodes are part of
@@ -54,7 +54,13 @@ The nodes are used for these jobs:
 * osuosl4-amd64: snapshot.r-b.o, manual debugging by vagrant
 * osuosl5-amd64: to be snapshot.r-b.o
 
-==== nodes at infomaniak.cloud
+==== amd64 and i386 nodes at infomaniak.cloud
+
+* infom01-amd64, doing Debian r-b CI builds
+* infom02-amd64, doing Debian r-b CI builds, running in the future
+* infom07-i386, doing Debian r-b CI builds
+* infom08-i386, doing Debian r-b CI builds, running in the future
+
 
 $ sudo apt install openstack-clients
 $ source ~/.openstack.infomanik.cloud.vars


=====================================
THANKS.head
=====================================
@@ -25,7 +25,9 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit
  ** 2 cores and 12 GB memory for ionos14-amd64.debian.net used as a http(s)-proxy for the other half of our ionos nodes
  * link:https://www.infomaniak.com/en/hosting/public-cloud[infomaniak's public cloud] also provides us with two 'amd64' nodes:
  ** 12 cores and 24 GB memory for infom01-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
- ** 12 cores and 24 GB memory for infom02-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
+ ** 12 cores and 24 GB memory for infom02-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o), running in the future
+ ** 8 cores and 16 GB memory for infom01-i386.debian.net used for building i386 Debian packages for tests.reproducible-builds.org (t.r-b.o)
+ ** 8 cores and 16 GB memory for infom02-i386.debian.net used for building i386 Debian packages for tests.reproducible-builds.org (t.r-b.o), running in the future
  * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] provides and hosts 13 'armhf' systems, used for building armhf Debian packages for t.r-b.o:
  ** four quad-cores with 4 GB RAM each,
  ** 'armhf' servers provided by linaro, hosted at Varant:


=====================================
TODO.infrastructure
=====================================
@@ -15,6 +15,9 @@ free sdd space: 260 GB
 
 ordered todo
 ------------
+infom06+08
+	add workers
+	document kernel (non) variation
 djm:
 	codethink nodes: make powercycle via djm work
 	infomaniak nodes: make powercycle via djm work


=====================================
bin/djm
=====================================
@@ -61,7 +61,7 @@ node_in_the_future () {
 		ionos5-amd64*|ionos6-i386*|ionos15-amd64*|ionos16-i386*) true ;;
 		codethink01*|codethink03*) true ;;
 		osuosl2*) true ;;
-		infom02*) true ;;
+		infom02*|infom08*) true ;;
 		*) false ;;
 	esac
 }


=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -44,7 +44,9 @@ osuosl1-amd64.debian.net
 osuosl2-amd64.debian.net
 osuosl3-amd64.debian.net
 infom01-amd64.debian.net
-infom02-amd64.debian.net"
+infom02-amd64.debian.net
+infom07-i386.debian.net
+infom08-i386.debian.net"
 
 NODE_RUN_IN_THE_FUTURE=false
 get_node_information() {


=====================================
hosts/common/etc/pbuilderrc
=====================================
@@ -29,7 +29,7 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those nodes running in the future…)
 case $HOSTNAME in
-	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink01-arm64|codethink03-arm64|infom02-amd64)
+	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink01-arm64|codethink03-arm64|infom02-amd64|infom08-i386)
 		APTGETOPT=(-o Acquire::Check-Valid-Until="false")
 		;;
 	*)	;;


=====================================
hosts/common/etc/rc.local
=====================================
@@ -101,6 +101,7 @@ case $(hostname) in
 	ionos16*)		send_back_to_the_future ;;
 	osuosl2*)		send_back_to_the_future time.osuosl.org ;;
 	infom02*)		send_back_to_the_future ch.pool.ntp.org ;;
+	infom08*)		send_back_to_the_future ch.pool.ntp.org ;;
 	*)			;;
 esac
 


=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -495,6 +495,14 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     address infom02-amd64.debian.net
     use_node_name yes
 
+[debian.net;infom07-i386.debian.net]
+    address infom07-i386.debian.net
+    use_node_name yes
+
+[debian.net;infom08-i386.debian.net]
+    address infom08-i386.debian.net
+    use_node_name yes
+
 [freebsd-jenkins.debian.net]
     address 46.16.73.236
     use_node_name yes
@@ -547,7 +555,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 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
+	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 infom07-i386.debian.net infom08-i386.debian.net
 
 [reproducible-builds.org;]
 	node_order rb-mail1.reproducible-builds.org


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -339,6 +339,8 @@
                 - 'osuosl5':        { my_arch: 'amd64' }
                 - 'infom01':        { my_arch: 'amd64' }
                 - 'infom02':        { my_arch: 'amd64' }
+                - 'infom07':        { my_arch: 'i386' }
+                - 'infom08':        { my_arch: 'i386' }
                 - 'codethink01':    { my_arch: 'arm64' }
                 - 'codethink02':    { my_arch: 'arm64' }
                 - 'codethink03':    { my_arch: 'arm64' }
@@ -386,6 +388,8 @@
                 - 'osuosl5':        { my_arch: 'amd64' }
                 - 'infom01':        { my_arch: 'amd64' }
                 - 'infom02':        { my_arch: 'amd64' }
+                - 'infom07':        { my_arch: 'i386' }
+                - 'infom08':        { my_arch: 'i386' }
                 - 'codethink01':    { my_arch: 'arm64' }
                 - 'codethink02':    { my_arch: 'arm64' }
                 - 'codethink03':    { my_arch: 'arm64' }
@@ -438,6 +442,8 @@
                 - 'codethink04':    { my_arch: 'arm64' }
                 - 'infom01':        { my_arch: 'amd64' }
                 - 'infom02':        { my_arch: 'amd64' }
+                - 'infom07':        { my_arch: 'i386' }
+                - 'infom08':        { my_arch: 'i386' }
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_naginator_regex: '^E: Couldn.t download .*/Packages'
 


=====================================
nodes/list.yml
=====================================
@@ -79,6 +79,7 @@
   port: 22
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINsu6DXrKHUHdAx4flpS4Y/i4rOP8+lzI0Kyp6pscv5K root at osuosl2-amd64
+  time: future
 - hostname: osuosl3-amd64.debian.net
   ip: 140.211.9.211
   port: 22
@@ -104,6 +105,7 @@
   ip: 195.15.253.25
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCi1NXei3/Iuz/SwAgbXuc6z0Yax7xipJSfT0HmHYkY root at infom02
+  time: future
 - hostname: infom07-i386.debian.net
   ip: 195.15.242.91
   keys:
@@ -112,6 +114,7 @@
   ip: 195.15.242.54
   keys:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEv13TLxgS8ZqqldnJ+qswkH3gpvaFEMtLErTWa+ck7 root at infom08
+  time: future
 
 # arm64
 - hostname: codethink01-arm64.debian.net


=====================================
update_jdn.sh
=====================================
@@ -67,7 +67,7 @@ case $HOSTNAME in
 		# set correct date
 		set_correct_date time.osuosl.org
 		;;
-	infom02*)
+	infom02*|infom08*)
 		# set correct date
 		set_correct_date ch.pool.ntp.org
 		;;
@@ -440,7 +440,7 @@ if [ -f /etc/debian_version ] ; then
 			ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386) DEBS="$DEBS ntpdate" ;;
 			codethink01*|codethink03*) DEBS="$DEBS ntpdate" ;;
 			osuosl2*) DEBS="$DEBS ntpdate" ;;
-			infom02*) DEBS="$DEBS ntpdate" ;;
+			infom02*|infom08*) DEBS="$DEBS ntpdate" ;;
 			*) ;;
 		esac
 		# needed to run coreboot/openwrt/netbsd/fedora jobs
@@ -633,11 +633,12 @@ if [ -f /etc/debian_version ] ; then
 		$UP2DATE || sudo apt-get update
 		$UP2DATE || sudo apt-get install $DEBS $MASTERDEBS
 		# for varying kernels:
-		# - we use bpo kernels on osuosl2 and ionos5+15 and infom02 (and the default amd64 kernel on ionos6+16-i386)
+		# - we use bpo kernels on osuosl2 and ionos5+15 and infom02+08 (and the default amd64 kernel on ionos6+16-i386)
 		# - this is done as a separate step as bpo kernels are frequently uninstallable when upgraded on bpo
 		if [ "$HOSTNAME" = "ionos5-amd64" ] || [ "$HOSTNAME" = "ionos15-amd64" ] \
 			|| [ "$HOSTNAME" = "osuosl2-amd64" ] \
 			|| [ "$HOSTNAME" = "infom02-amd64" ] \
+			|| [ "$HOSTNAME" = "infom08-i386" ] \
 			|| [ "$HOSTNAME" = "jenkins" ] ; then
 			sudo apt install linux-image-amd64/bookworm-backports || true # backport kernels are frequently uninstallable...
 			:
@@ -987,6 +988,10 @@ case $HOSTNAME in
 		disable_dsa_check_packages
 		sudo date --set="+398 days +6 hours + 23 minutes"
 		;;
+	infom08-i386)
+		disable_dsa_check_packages
+		sudo date --set="+398 days +6 hours + 23 minutes"
+		;;
 	jenkins)
 		# notify irc on updates of jenkins.d.n
 		MESSAGE="jenkins.d.n updated to $(cd $BASEDIR ; git describe --always)."



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/cc1ed00634926b852fbd4c96bef59b75e6996d2b
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/20240424/e48f4161/attachment-0001.htm>


More information about the Qa-jenkins-scm mailing list