[Git][qa/jenkins.debian.net][master] jenkins: move r-b.o Debian live builds and Debian *strap jobs to ionos10
Holger Levsen (@holger)
gitlab at salsa.debian.org
Tue Sep 23 11:23:32 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
0fb118f4 by Holger Levsen at 2025-09-23T12:23:03+02:00
jenkins: move r-b.o Debian live builds and Debian *strap jobs to ionos10
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
9 changed files:
- README.infrastructure
- THANKS.head
- bin/common-functions.sh
- bin/reproducible_debian_live_sync_result.sh
- bin/reproducible_html_nodes_info.sh
- jenkins-home/authorized_keys
- job-cfg/mmdebstrap.yaml
- job-cfg/reproducible.yaml
- update_jdn.sh
Changes:
=====================================
README.infrastructure
=====================================
@@ -46,11 +46,11 @@ the .reproducible.osuosl.org domain and can also be reached via .debian.net.
The nodes are used for these jobs:
-* osuosl1-amd64: coreboot, netbsd
-* osuosl2-amd64: coreboot
+* osuosl1-amd64: r-b.o coreboot, netbsd
+* osuosl2-amd64: r-b.o coreboot
** osuosl2 is running in the future
-* osuosl31-amd64: Debian live-builds / Debian bootstrap jobs / mmdebstrap-jenkins jobs / openqa.d.n workers
-* osuosl31-amd64: Debian janitor
+* osuosl31-amd64: openqa.d.n workers
+* osuosl32-amd64: Debian janitor
* osuosl41-amd64: rebuilderd worker
* osuosl42-amd64: rebuilderd worker
* osuosl43-amd64: rebuilderd worker
=====================================
THANKS.head
=====================================
@@ -15,7 +15,7 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit
** 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
** 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
- ** 6 cores and 12 GB memory for ionos10-amd64.debian.net used for chroot-installation jobs
+ ** 12 cores and 14 GB memory for ionos10-amd64.debian.net used for chroot-installation jobs, for building Debian live and testing for reproducibility, and for Debian bootstrapping jobs
** 16 cores and 16 GB memory for ionos20-amd64.debian.net used as a rebuilderd-worker for https://reproduce.debian.net
** 16 cores and 16 GB memory for ionos21-amd64.debian.net used as a rebuilderd-worker for https://reproduce.debian.net
** 16 cores and 16 GB memory for ionos22-amd64.debian.net used as a rebuilderd-worker for https://reproduce.debian.net
@@ -42,7 +42,7 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit
* In spring 2023 we got access to some new nodes hosted by link:https://osuosl.org/[OSUOSL]:
** 16 cores with 128 GB memory for osuosl1-amd64.reproducible.osuosl.org used for building OpenWrt, coreboot and NetBSD for t.r-b.o
** 16 cores with 128 GB memory for osuosl2-amd64.reproducible.osuosl.org used for building OpenWrt, coreboot for t.r-b.o
- ** 8 cores with 64 GB memory for osuosl31-amd64.debian.net used for building Debian live, Debian bootstrapping jobs, mmdebstrap-jenkins jobs and openqa.d.n workers
+ ** 8 cores with 64 GB memory for osuosl31-amd64.debian.net used for https://openqa.debian.net
** 8 cores with 64 GB memory for osuosl32-amd64.debian.net used for Debian janitor jobs
** 4 cores with 32 GB memory for osuosl41-amd64.debian.net, a rebuilderd-worker for https://reproduce.debian.net
** 4 cores with 32 GB memory for osuosl42-amd64.debian.net, a rebuilderd-worker for https://reproduce.debian.net
=====================================
bin/common-functions.sh
=====================================
@@ -240,7 +240,7 @@ jenkins_zombie_check() {
# this has happened on 2025-01 again
# this has happened on 2025-05-13 again
#
- ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | grep -E '(strip-nondeterminism|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|dpkg_buster_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_|lintian-tests|udd_stretch|d-i_pu-build|debsums-tests|debian-archive-keyring-tests|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc1[01234]($|_)|brcm47xx|rebootstrap_(kfreebsd-|nios2_)|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|archlinux|openwrt-target-(ath97|tegra)|openwrt_rebuilder|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|live_setup_schroot|reproducible_debian_live_build$|live_build_debian_stretch_gnome|chroot-installation_stretch|chroot-installation_bookworm*upgrade_to_sid|rebuilder_prototype|osuosl4$|osuosl167|osuosl168|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184|fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot|reproducible_.*_stretch_.*|osuosl3$|chroot-installation_buster|udd_buster_multiarch_versionskew|disorderfs_from_git|reprotest_from_git|diffoscope_from_git|reproducible_create_meta_pkg_sets$|reproducible_create_meta_pkg_sets_trixie|reproducible_scheduler$|d-i_overview_kfreebsd|codethink9|codethink1|reproducible_.*buster|jtx|reproducible_setup_pbuilder_*ionos(4|14)|reproducible_setup_.*infom07|reproducible_setup_pbuilder_*codethink01|reproducible_setup_pbuilder_*codethink02|riscv64-03|riscv64-35|i386_infom07|i386_infom08|scheduler_i386|ionos2$|ionos12$|ionos6$|ionos16$|ionos17$|ionos18$|chroot-installation_bullseye|dpkg_bookworm_find_trigger_cycles|setup_pbuilder_bullseye|setup_schroot_bullseye|strap_bullseye|scheduler_armhf|reproducible.*_armhf|chroot-installation_trixie_install_.*_upgrade_to_sid|_alpine)' || true)"
+ ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | grep -E '(strip-nondeterminism|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|dpkg_buster_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_|lintian-tests|udd_stretch|d-i_pu-build|debsums-tests|debian-archive-keyring-tests|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc1[01234]($|_)|brcm47xx|rebootstrap_(kfreebsd-|nios2_)|diffoscope_amd64_osuosl31|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|archlinux|openwrt-target-(ath97|tegra)|openwrt_rebuilder|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|live_setup_schroot|reproducible_debian_live_build$|live_build_debian_stretch_gnome|chroot-installation_stretch|chroot-installation_bookworm*upgrade_to_sid|rebuilder_prototype|osuosl4$|osuosl167|osuosl168|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184|fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot|reproducible_.*_stretch_.*|osuosl3$|chroot-installation_buster|udd_buster_multiarch_versionskew|disorderfs_from_git|reprotest_from_git|diffoscope_from_git|reproducible_create_meta_pkg_sets$|reproducible_create_meta_pkg_sets_trixie|reproducible_scheduler$|d-i_overview_kfreebsd|codethink9|codethink1|reproducible_.*buster|jtx|reproducible_setup_pbuilder_*ionos(4|14)|reproducible_setup_.*infom07|reproducible_setup_pbuilder_*codethink01|reproducible_setup_pbuilder_*codethink02|riscv64-03|riscv64-35|i386_infom07|i386_infom08|scheduler_i386|ionos2$|ionos12$|ionos6$|ionos16$|ionos17$|ionos18$|chroot-installation_bullseye|dpkg_bookworm_find_trigger_cycles|setup_pbuilder_bullseye|setup_schroot_bullseye|strap_bullseye|scheduler_armhf|reproducible.*_armhf|chroot-installation_trixie_install_.*_upgrade_to_sid|_alpine)' || true)"
if [ -n "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/reproducible_debian_live_sync_result.sh
=====================================
@@ -17,7 +17,7 @@ set -o pipefail # see eg http://petereisentraut.blogspot.com/2010/11/pipefail.ht
PROJECT_NAME=debian_live_build
PROJECT_PATH=debian/live_build
-NODE=osuosl31-amd64.debian.net
+NODE=ionos10-amd64.debian.net
RBUILDLOG=/dev/null
# Argument 1 = description
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -19,13 +19,13 @@ explain_nodes() {
jenkins) ;;
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)</small>" ;;
+ ionos10) write_page "<br /><small>(jenkins.d.n chroot-installation jobs, r-b Debian live-builds and (c)debootstrap / mmdebstrap jobs)</small>" ;;
ionos2*) write_page "<br /><small>(r.d.n rebuilderd-worker)</small>" ;;
ionos30) write_page "<br /><small>(OpenWrt worker for reproducible-builds.org)</small>" ;;
osuosl1) write_page "<br /><small>(r-b Alpine, Coreboot, NetBSD)</small>" ;;
osuosl2) write_page "<br /><small>(r-b Alpine, Coreboot)</small>" ;;
- osuosl31) write_page "<br /><small>(r-b Debian live-build / bootstrap / mmdebstrap-jenkins jobs and openqa.d.n worker</small>" ;;
- osuosl32) write_page "<br /><small>(Debian janitor jobs</small>" ;;
+ osuosl31) write_page "<br /><small>(nd openqa.d.n worker)</small>" ;;
+ osuosl32) write_page "<br /><small>(Debian janitor jobs)</small>" ;;
osuosl4*) write_page "<br /><small>(r.d.n rebuilderd-worker)</small>" ;;
codethink04) write_page "<br /><small>(r-b Debian builds and http(s)-proxy)</small>" ;;
ionos*4) write_page "<br /><small>(r-b http(s)-proxy)</small>" ;;
@@ -156,20 +156,13 @@ build_nodes_health_page() {
URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_schroot_${SUITE}_diffoscope_${ARCH}_${JENKINS_NODENAME}"
BADGE="$URL/badge/icon"
case $JENKINS_NODENAME in
- osuosl1|osuosl2)
+ osuosl1|osuosl2|ionos10)
if [ "$SUITE" = "unstable" ]; then
write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
else
write_page "<td></td>"
fi
;;
- osuosl31)
- if [ "$SUITE" = "buster" ] || [ "$SUITE" = "unstable" ]; then
- write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
- else
- write_page "<td></td>"
- fi
- ;;
jenkins)
write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
;;
=====================================
jenkins-home/authorized_keys
=====================================
@@ -1,5 +1,5 @@
# jenkins itself, to start the agents
restrict,from="127.0.0.1,::1" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSPYH1KKv6PsW0IgNcPbI/l2rjhxPaOGT/lbgaPzVjwPWlqHAEB0PctzNzkduRiaEMhTmcDTCsMOVkBGiPMmuBltqzpGSjcAc3v/sDYaDn+Onj5pTaG8HBMKqxOQP9I24xNjb21tRrmRSDAUrSHHiEm2Lu64efA3vE/L447ZYs53aLd2fBt0zoFKHswasFR57y6y9/3VJTdAnGrAIq9QxnMi2Tbg/KZDiYYmodfCMrAnATTkwGntcINz7FO/HAxHAs1YryzuoDOA02Xqxg4uzlxQgkL91/OhKVKd+2TBg+FAVUkiCKY+uSCdgN1yjoUa0fPFaWEbtEwrWfZgIAIINf jenkins at jenkins.debian.net
-# osuosl31 to trigger copying of files syncroniusly and not at the end of a job
-restrict,from="140.211.167.252",command="/srv/jenkins/bin/reproducible_debian_live_sync_result.sh" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINJsoqlhN555i97gtdPPnXV0fKnMngbUH3zwT/JEFDCR jenkins at osuosl3-amd64
+# ionos10 to trigger copying of files syncroniusly and not at the end of a job
+restrict,from="85.184.249.68",command="/srv/jenkins/bin/reproducible_debian_live_sync_result.sh" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINJsoqlhN555i97gtdPPnXV0fKnMngbUH3zwT/JEFDCR jenkins at osuosl3-amd64
=====================================
job-cfg/mmdebstrap.yaml
=====================================
@@ -26,7 +26,7 @@
recipients: 'josch at debian.org'
builders:
- shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
- node: 'osuosl31'
+ node: 'ionos10'
- job:
defaults: mmdebstrap-jenkins
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -469,7 +469,7 @@
my_hname:
- 'osuosl1': { my_arch: 'amd64' }
- 'osuosl2': { my_arch: 'amd64' }
- - 'osuosl31': { my_arch: 'amd64' }
+ - 'ionos10': { my_arch: 'amd64' }
my_naginator_regex: '^E: Couldn.t download .*/Packages'
- '{name}_{my_task}':
@@ -549,62 +549,62 @@
my_description: 'Check mmdebstrap of unstable is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap unstable'
my_timed: '0 7 * * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'mmdebstrap_forky':
my_description: 'Check mmdebstrap of forky is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap forky'
my_timed: '5 7 * * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'mmdebstrap_trixie':
my_description: 'Check mmdebstrap of trixie is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap trixie'
my_timed: '10 7 1 * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'mmdebstrap_bookworm':
my_description: 'Check mmdebstrap of bookworm is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap bookworm'
my_timed: '15 7 1 * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'debootstrap_unstable':
my_description: 'Check debootstrap of unstable is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap unstable'
my_timed: '25 7 * * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'debootstrap_forky':
my_description: 'Check debootstrap of forky is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap forky'
my_timed: '35 7 * * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'debootstrap_trixie':
my_description: 'Check debootstrap of trixie is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap trixie'
my_timed: '45 7 1 * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'debootstrap_bookworm':
my_description: 'Check debootstrap of bookworm is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap bookworm'
my_timed: '55 7 1 * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'cdebootstrap_unstable':
my_description: 'Check cdebootstrap of unstable is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap unstable'
my_timed: '0 6 * * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'cdebootstrap_forky':
my_description: 'Check cdebootstrap of forky is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap forky'
my_timed: '10 6 * * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'cdebootstrap_trixie':
my_description: 'Check cdebootstrap of trixie is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap trixie'
my_timed: '20 6 1 * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'cdebootstrap_bookworm':
my_description: 'Check cdebootstrap of bookworm is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap bookworm'
my_timed: '30 6 1 * *'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
- 'json':
my_description: 'Generate https://reproducible.debian.net/userContent/reproducible.json and https://reproducible.debian.net/userContent/reproducible-tracker.json'
my_timed: '1 H/2 * * *'
@@ -824,7 +824,7 @@
- last-duration
- build-button
- extra-last-output
- regex: reproducible_debian_live_build_.*|reproducible_maintenance_amd64_osuosl31|reproducible_node_health_check_amd64_osuosl31
+ regex: reproducible_debian_live_build_.*|reproducible_maintenance_amd64_ionos10|reproducible_node_health_check_amd64_ionos10
- project:
name: reproducible_debian_live_build
@@ -862,6 +862,6 @@
jobs:
- 'reproducible_debian_live_build_{imagetype}_{debian_version}':
my_description: 'Build Debian {imagetype} live image for {debian_version} using live-build'
- my_hname: 'osuosl31'
+ my_hname: 'ionos10'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh {imagetype} {debian_version} {installer_origin}'
=====================================
update_jdn.sh
=====================================
@@ -97,14 +97,15 @@ user_host_groups['phil','osuosl31-amd64']="$sudo_groups"
#user_host_groups['lunar','jenkins']='reproducible'
user_host_groups['lynxis','osuosl1-amd64']="$sudo_groups"
user_host_groups['lynxis','osuosl2-amd64']="$sudo_groups"
-user_host_groups['lynxis','osuosl5-amd64']="$sudo_groups"
+#user_host_groups['lynxis','osuosl5-amd64']="$sudo_groups"
user_host_groups['lynxis','jenkins']="jenkins"
user_host_groups['kpcyrd','osuosl1-amd64']="$sudo_groups"
user_host_groups['kpcyrd','osuosl2-amd64']="$sudo_groups"
user_host_groups['kpcyrd','jenkins']="jenkins"
user_host_groups['vagrant','*']="$sudo_groups"
-user_host_groups['fpierret','osuosl5-amd64']="$sudo_groups"
+#user_host_groups['fpierret','osuosl5-amd64']="$sudo_groups"
user_host_groups['rclobus','osuosl31-amd64']="$sudo_groups"
+user_host_groups['rclobus','ionos10-amd64']="$sudo_groups"
user_host_groups['bernhard','xxxxx']="$sudo_groups"
user_host_groups['jbglaw','osuosl1-amd64']="$sudo_groups"
user_host_groups['jbglaw','osuosl2-amd64']="$sudo_groups"
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/0fb118f44464c1d0027f08aa38eba8e69a573135
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/0fb118f44464c1d0027f08aa38eba8e69a573135
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/20250923/e7cbd0cf/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list