Commit a8815d1c authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible: migrate everything from osuosl167 to osuosl3 and retire the former 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent e2923369

README.infrastructure

+1 −4
Original line number Diff line number Diff line
@@ -49,16 +49,13 @@ The nodes are used for these jobs: 
* osuosl2-amd64: archlinux, alpine, coreboot, openwrt

** osuosl2 is running in the future

** the alpine jobs are disabled

* osuosl3-amd64: Debian live-builds / Debian bootstrap jobs

* osuosl3-amd64: Debian live-builds / Debian bootstrap jobs / debian-janitor / mmdebstrap-jenkins jobs

* osuosl4-amd64: snapshot.r-b.o, soon not anymore, then free for other stuff

* osuosl5-amd64: to be snapshot.r-b.o



===== legacy nodes at OSUOSL



* osuosl167: debian-janitor and mmdebstrap-jenkins jobs

** janitor and openqa worker should be split on different nodes

* osuosl168: openqa.d.n workers

** is constantly online (in jenkins) now, which is not how we like it and still doesnt solve the netbsd job probs



=== arm64 nodes

THANKS.head

+1 −2
Original line number Diff line number Diff line
@@ -38,12 +38,11 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit 
 ** 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 used for Debian janitor jobs and mmdebstrap-jenkins jobs

  ** 32 cores with 144 GB memory for osuosl168-amd64.debian.net used for openqa.d.n workers

 * In spring 2023 we got access to some new nodes hosted by link:https://osuosl.org/[OSUOSL]:

  ** 16 cores with 125 GB memory for osuosl1-amd64.reproducible.osuosl.org used for building Arch Linux, OpenWrt, coreboot and NetBSD for t.r-b.o

  ** 16 cores with 125 GB memory for osuosl2-amd64.reproducible.osuosl.org used for building Arch Linux, OpenWrt, coreboot for t.r-b.o

  ** 16 cores with 125 GB memory for osuosl3-amd64.reproducible.osuosl.org used for building Debian live and Debian bootstrapping jobs

  ** 16 cores with 125 GB memory for osuosl3-amd64.reproducible.osuosl.org used for building Debian live, Debian bootstrapping jobs, Debian janitor jobs and mmdebstrap-jenkins jobs



==== Past sponsors

TODO

+2 −2
Original line number Diff line number Diff line
@@ -32,16 +32,16 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian 
* five new nodes 

** make sure they can send mail to root

** run osuosl2 in the future

** tmpfs /srv/workspace setup (in update_jdn and hosts/common/etc/rc.local) for o1, o2 & o3

** tune diskspace needs

** confirm squid is working

** fil would like to run 2 worker on osuosl1+3, this needs bookworm, which should be fine

** maybe run osuosl1 with a bpo kernel

** mv snapshot.r-b.o from osuosl4 to osuosl5

** add link to OSUOSL in THANKS and explain usage

** shutdown legacy nodes at OSUOSL:

*** osuosl167

*** osuosl168

*** already zombified, just waiting for osuosl ack:

**** osuosl167

**** osuosl170

**** osuosl173

**** osuosl184

bin/common-functions.sh

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ jenkins_zombie_check() { 
	# related however is that I issued a reboot (via running 

	# /sbin/reboot) right before the zombies appeared...

	#

	ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-9]($|_)|rebootstrap_.*_gcc1[01]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|g-i-installation|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c|ar71xx|reproducible_debian_live_build$|chroot-installation_stretch|chroot-installation_bullseye*upgrade_to_sid|rebuilder_prototype|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot' || true)"

	ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-9]($|_)|rebootstrap_.*_gcc1[01]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|g-i-installation|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c|ar71xx|reproducible_debian_live_build$|chroot-installation_stretch|chroot-installation_bullseye*upgrade_to_sid|rebuilder_prototype|osuosl167|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot' || true)"

	if [ ! -z "$ZOMBIES" ] ; then

		DIRTY=true

		figlet 'zombies!!!'

bin/jenkins_node_definitions.sh

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ wbq0-armhf-rb.debian.net 
osuosl1-amd64.debian.net

osuosl2-amd64.debian.net

osuosl3-amd64.debian.net

osuosl167-amd64.debian.net

osuosl168-amd64.debian.net"



NODE_RUN_IN_THE_FUTURE=false