[Git][qa/jenkins.debian.net][master] jenkins nodes: split osuosl3 into 31 for openqa and 32 for janitor
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Sep 22 14:30:37 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
954163a9 by Holger Levsen at 2025-09-22T15:29:54+02:00
jenkins nodes: split osuosl3 into 31 for openqa and 32 for janitor
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
25 changed files:
- INSTALL
- README.infrastructure
- THANKS.head
- TODO.infrastructure
- bin/common-functions.sh
- bin/djm
- bin/jenkins_node_definitions.sh
- bin/reproducible_debian_live_sync_result.sh
- bin/reproducible_html_nodes_info.sh
- hosts/jenkins/etc/munin/munin.conf
- − hosts/osuosl3-amd64/etc/nagios/obsolete-packages-ignore
- hosts/osuosl3-amd64/etc/apt-cacher-ng/backends_debian → hosts/osuosl31-amd64/etc/apt-cacher-ng/backends_debian
- hosts/osuosl3-amd64/etc/apt/apt.conf.d/80proxy → hosts/osuosl31-amd64/etc/apt/apt.conf.d/80proxy
- hosts/osuosl3-amd64/etc/apt/sources.list.d/bookworm-fasttrack.list → hosts/osuosl31-amd64/etc/apt/sources.list.d/bookworm-fasttrack.list
- hosts/osuosl3-amd64/etc/openqa/workers.ini → hosts/osuosl31-amd64/etc/openqa/workers.ini
- hosts/osuosl3-amd64/etc/postfix/main.cf → hosts/osuosl31-amd64/etc/postfix/main.cf
- hosts/osuosl3-amd64/etc/squid/squid.conf → hosts/osuosl31-amd64/etc/squid/squid.conf
- hosts/osuosl3-amd64/etc/sudoers.d/live-build → hosts/osuosl31-amd64/etc/sudoers.d/live-build
- hosts/osuosl3-amd64/etc/sysctl.d/80-vm-dirty.conf → hosts/osuosl31-amd64/etc/sysctl.d/80-vm-dirty.conf
- jenkins-home/authorized_keys
- job-cfg/janitor.yaml
- job-cfg/mmdebstrap.yaml
- job-cfg/reproducible.yaml
- nodes/list.yml
- update_jdn.sh
Changes:
=====================================
INSTALL
=====================================
@@ -74,7 +74,7 @@ cd jenkins.debian.net
'vncdotool' is the only software which is not installed by packages and is not covered by this script.
-The configuration of the openQA secrets is done manually. The file `/etc/openqa/client.conf` (on osuosl3) contains the API key for accessing the openQA server.
+The configuration of the openQA secrets is done manually. The file `/etc/openqa/client.conf` (on osuosl31) contains the API key for accessing the openQA server.
* In Jenkins, go to 'Dashboard | Credentials | System | Global credentials'
* Add 2 entries (one for ID=openqa-live-apikey and one for ID=openqa-live-apisecret)
@@ -82,7 +82,7 @@ The configuration of the openQA secrets is done manually. The file `/etc/openqa/
* Scope: Global
* Secret: **see client.conf**
* ID: openqa-live-apikey
- * Description: The apikey from /etc/openqa/client.conf on osuosl3
+ * Description: The apikey from /etc/openqa/client.conf on osuosl31
=== IRC notification configuration using kgb-client
=====================================
README.infrastructure
=====================================
@@ -49,7 +49,8 @@ The nodes are used for these jobs:
* osuosl1-amd64: coreboot, netbsd
* osuosl2-amd64: coreboot
** osuosl2 is running in the future
-* osuosl3-amd64: Debian live-builds / Debian bootstrap jobs / debian-janitor / mmdebstrap-jenkins jobs / openqa.d.n workers
+* osuosl31-amd64: Debian live-builds / Debian bootstrap jobs / mmdebstrap-jenkins jobs / openqa.d.n workers
+* osuosl31-amd64: Debian janitor
* osuosl41-amd64: rebuilderd worker
* osuosl42-amd64: rebuilderd worker
* osuosl43-amd64: rebuilderd worker
=====================================
THANKS.head
=====================================
@@ -42,7 +42,8 @@ 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
- ** 16 cores with 128 GB memory for osuosl3-amd64.reproducible.osuosl.org used for building Debian live, Debian bootstrapping jobs, Debian janitor jobs, mmdebstrap-jenkins jobs and openqa.d.n workers
+ ** 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 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
** 4 cores with 32 GB memory for osuosl43-amd64.debian.net, a rebuilderd-worker for https://reproduce.debian.net
=====================================
TODO.infrastructure
=====================================
@@ -43,9 +43,6 @@ nice to have
------------
make it so that *either* openwrt, coreboot or netbsd is built
FIXME: this needs a plan
-split this on several hosts:
- osuosl3-amd64: Debian live-builds / Debian bootstrap jobs / debian-janitor / mmdebstrap-jenkins jobs / openqa.d.n workers
- FIXME: this needs a plan
improve ionos naming scheme so the datacenter becomes visible and whether its running in the future or not?
ionos151 - fkb/5/future
ionos050 - fra/5/today
=====================================
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_.*|buster_diffoscope_amd64_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_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)"
if [ -n "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/djm
=====================================
@@ -171,7 +171,7 @@ show_help(){
echo "djm -y/--year YEAR define YEAR for showing report"
echo "djm TARGET ACTION REASON do ACTION on all TARGET(s) for REASON, see below:"
echo
- echo "TARGET= 'all' or grepable (jenkins, amd64, ionos, osuosl3) from ./nodes/list_nodes"
+ echo "TARGET= 'all' or grepable (jenkins, amd64, ionos, osuosl31) from ./nodes/list_nodes"
echo " or special target '.' for jenkins-ui ACTION."
echo
echo "ACTION= one of these:"
=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -12,7 +12,7 @@
# nice to also include ionos4,7,9,10+14, to also cleanup
# jobs there…
# FIXME: this list is also defined in two places:
-# - as the list below can also be constructed like this: ./nodes/list_nodes |grep -Ev "(rb-mail|jenkins|ionos4|ionos7|ionos9|ionos10|ionos14|osuosl4|osuosl5)"
+# - as the list below can also be constructed like this: ./nodes/list_nodes |grep -Ev "(rb-mail|jenkins|ionos4|ionos7|ionos9|ionos10|ionos14|osuosl3|osuosl4|osuosl5)"
BUILD_NODES="
codethink03-arm64.debian.net
codethink04-arm64.debian.net
@@ -22,7 +22,6 @@ ionos11-amd64.debian.net
ionos15-amd64.debian.net
osuosl1-amd64.debian.net
osuosl2-amd64.debian.net
-osuosl3-amd64.debian.net
infom01-amd64.debian.net
infom02-amd64.debian.net"
=====================================
bin/reproducible_debian_live_sync_result.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2022 Mattia Rizzolo <mattia at debian.org>
-# Copyright 2022-2023 Holger Levsen <holger at layer-acht.org>
+# Copyright 2022-2025 Holger Levsen <holger at layer-acht.org>
# released under the GPLv2
DEBUG=false
@@ -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=osuosl3-amd64.debian.net
+NODE=osuosl31-amd64.debian.net
RBUILDLOG=/dev/null
# Argument 1 = description
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -24,7 +24,8 @@ explain_nodes() {
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>" ;;
- 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>" ;;
+ 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>" ;;
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>" ;;
@@ -72,9 +73,10 @@ build_nodes_health_page() {
elif [ "$NODE" = "ionos11-amd64.debian.net" ] ; then
# ionos14 squid
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos14-amd64.debian.net"
- elif [ "$NODE" = "osuosl3-amd64.debian.net" ] ; then
+ elif [ "$NODE" = "osuosl31-amd64.debian.net" ] ; then
# osuosl5
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES
+ osuosl32-amd64.debian.net
osuosl41-amd64.debian.net
osuosl42-amd64.debian.net
osuosl43-amd64.debian.net
@@ -161,7 +163,7 @@ build_nodes_health_page() {
write_page "<td></td>"
fi
;;
- osuosl3)
+ osuosl31)
if [ "$SUITE" = "buster" ] || [ "$SUITE" = "unstable" ]; then
write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
else
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -344,10 +344,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
address ssh://jenkins@osuosl2-amd64.debian.net:22/bin/nc localhost 4949
use_node_name yes
-[debian.net;osuosl3-amd64.debian.net]
- address osuosl3-amd64.debian.net
- use_node_name yes
-
[debian.net;osuosl31-amd64.debian.net]
address ssh://jenkins@osuosl31-amd64.debian.net:22/bin/nc localhost 4949
use_node_name yes
@@ -535,7 +531,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 ionos4-amd64.debian.net ionos5-amd64.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos14-amd64.debian.net ionos15-amd64.debian.net ionos20-amd64.debian.net ionos21-amd64.debian.net ionos22-amd64.debian.net ionos23-amd64.debian.net ionos24-amd64.debian.net ionos25-amd64.debian.net ionos30-amd64.debian.net codethink01-arm64.debian.net codethink02-arm64.debian.net codethink03-arm64.debian.net codethink04-arm64.debian.net codethink05-arm64.debian.net freebsd-jenkins.debian.net osuosl1-amd64.debian.net osuosl2-amd64.debian.net osuosl3-amd64.debian.net osuosl31-amd64.debian.net osuosl32-amd64.debian.net osuosl41-amd64.debian.net osuosl42-amd64.debian.net osuosl43-amd64.debian.net osuosl44-amd64.debian.net osuosl5-amd64.debian.net infom01-amd64.debian.net infom02-amd64.debian.net infom07-amd64.debian.net infom08-amd64.debian.net riscv64-01.debian.net riscv64-02.debian.net riscv64-04.debian.net riscv64-06.debian.net riscv64-07.debian.net riscv64-33.debian.net riscv64-34.debian.net osuosl6-ppc64el.debian.net osuosl7-ppc64el.debian.net
+ node_order jenkins.debian.net ionos1-amd64.debian.net ionos4-amd64.debian.net ionos5-amd64.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos14-amd64.debian.net ionos15-amd64.debian.net ionos20-amd64.debian.net ionos21-amd64.debian.net ionos22-amd64.debian.net ionos23-amd64.debian.net ionos24-amd64.debian.net ionos25-amd64.debian.net ionos30-amd64.debian.net codethink01-arm64.debian.net codethink02-arm64.debian.net codethink03-arm64.debian.net codethink04-arm64.debian.net codethink05-arm64.debian.net freebsd-jenkins.debian.net osuosl1-amd64.debian.net osuosl2-amd64.debian.net osuosl31-amd64.debian.net osuosl32-amd64.debian.net osuosl41-amd64.debian.net osuosl42-amd64.debian.net osuosl43-amd64.debian.net osuosl44-amd64.debian.net osuosl5-amd64.debian.net infom01-amd64.debian.net infom02-amd64.debian.net infom07-amd64.debian.net infom08-amd64.debian.net riscv64-01.debian.net riscv64-02.debian.net riscv64-04.debian.net riscv64-06.debian.net riscv64-07.debian.net riscv64-33.debian.net riscv64-34.debian.net osuosl6-ppc64el.debian.net osuosl7-ppc64el.debian.net
[reproducible-builds.org;]
node_order rb-mail1.reproducible-builds.org
=====================================
hosts/osuosl3-amd64/etc/nagios/obsolete-packages-ignore deleted
=====================================
@@ -1,3 +0,0 @@
-megacli
-libncurses5:amd64
-libtinfo5:amd64
=====================================
hosts/osuosl3-amd64/etc/apt-cacher-ng/backends_debian → hosts/osuosl31-amd64/etc/apt-cacher-ng/backends_debian
=====================================
=====================================
hosts/osuosl3-amd64/etc/apt/apt.conf.d/80proxy → hosts/osuosl31-amd64/etc/apt/apt.conf.d/80proxy
=====================================
=====================================
hosts/osuosl3-amd64/etc/apt/sources.list.d/bookworm-fasttrack.list → hosts/osuosl31-amd64/etc/apt/sources.list.d/bookworm-fasttrack.list
=====================================
=====================================
hosts/osuosl3-amd64/etc/openqa/workers.ini → hosts/osuosl31-amd64/etc/openqa/workers.ini
=====================================
@@ -27,7 +27,7 @@ HOST = https://openqa.debian.net
# (required by the web UI's developer mode and backends using jump-hosts to
# reach back to os-autoinst; set if the automatically deduced value is not
# sufficient)
-WORKER_HOSTNAME = osuosl3-amd64.reproducible.osuosl.org
+WORKER_HOSTNAME = osuosl31-amd64.reproducible.osuosl.org
# Optimize asset uploads. Enabled by default. When enabled the worker will
# try to copy assets on the file system instead of uploading them to the
=====================================
hosts/osuosl3-amd64/etc/postfix/main.cf → hosts/osuosl31-amd64/etc/postfix/main.cf
=====================================
@@ -27,11 +27,11 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
# information on enabling SSL in the smtp client.
-myhostname = osuosl3-amd64.reproducible.osuosl.org
+myhostname = osuosl31-amd64.reproducible.osuosl.org
alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases
myorigin = /etc/mailname
-mydestination = osuosl3-amd64.reproducible.osuosl.org, localhost
+mydestination = osuosl31-amd64.reproducible.osuosl.org, localhost
relayhost = mail.holgerlevsen.de
smtpd_relay_restrictions = permit_mynetworks, reject
#mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
=====================================
hosts/osuosl3-amd64/etc/squid/squid.conf → hosts/osuosl31-amd64/etc/squid/squid.conf
=====================================
=====================================
hosts/osuosl3-amd64/etc/sudoers.d/live-build → hosts/osuosl31-amd64/etc/sudoers.d/live-build
=====================================
=====================================
hosts/osuosl3-amd64/etc/sysctl.d/80-vm-dirty.conf → hosts/osuosl31-amd64/etc/sysctl.d/80-vm-dirty.conf
=====================================
=====================================
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
-# osuosl3 to trigger copying of files syncroniusly and not at the end of a job
-restrict,from="140.211.9.211",command="/srv/jenkins/bin/reproducible_debian_live_sync_result.sh" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINJsoqlhN555i97gtdPPnXV0fKnMngbUH3zwT/JEFDCR jenkins at osuosl3-amd64
+# 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
=====================================
job-cfg/janitor.yaml
=====================================
@@ -27,7 +27,7 @@
recipients: 'jelmer+jenkins-janitor at jelmer.uk'
builders:
- shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
- node: 'osuosl3'
+ node: 'osuosl32'
- job:
defaults: janitor
=====================================
job-cfg/mmdebstrap.yaml
=====================================
@@ -26,7 +26,7 @@
recipients: 'josch at debian.org'
builders:
- shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
- node: 'osuosl3'
+ node: 'osuosl31'
- job:
defaults: mmdebstrap-jenkins
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -323,7 +323,6 @@
- 'ionos30': { my_arch: 'amd64' }
- 'osuosl1': { my_arch: 'amd64' }
- 'osuosl2': { my_arch: 'amd64' }
- - 'osuosl3': { my_arch: 'amd64' }
- 'osuosl31': { my_arch: 'amd64' }
- 'osuosl32': { my_arch: 'amd64' }
- 'osuosl41': { my_arch: 'amd64' }
@@ -376,7 +375,6 @@
- 'ionos30': { my_arch: 'amd64' }
- 'osuosl1': { my_arch: 'amd64' }
- 'osuosl2': { my_arch: 'amd64' }
- - 'osuosl3': { my_arch: 'amd64' }
- 'osuosl31': { my_arch: 'amd64' }
- 'osuosl32': { my_arch: 'amd64' }
- 'osuosl41': { my_arch: 'amd64' }
@@ -471,7 +469,7 @@
my_hname:
- 'osuosl1': { my_arch: 'amd64' }
- 'osuosl2': { my_arch: 'amd64' }
- - 'osuosl3': { my_arch: 'amd64' }
+ - 'osuosl31': { my_arch: 'amd64' }
my_naginator_regex: '^E: Couldn.t download .*/Packages'
- '{name}_{my_task}':
@@ -551,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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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: 'osuosl3'
+ my_hname: 'osuosl31'
- '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 * * *'
@@ -826,7 +824,7 @@
- last-duration
- build-button
- extra-last-output
- regex: reproducible_debian_live_build_.*|reproducible_maintenance_amd64_osuosl3|reproducible_node_health_check_amd64_osuosl3
+ regex: reproducible_debian_live_build_.*|reproducible_maintenance_amd64_osuosl31|reproducible_node_health_check_amd64_osuosl31
- project:
name: reproducible_debian_live_build
@@ -864,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: 'osuosl3'
+ my_hname: 'osuosl31'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh {imagetype} {debian_version} {installer_origin}'
=====================================
nodes/list.yml
=====================================
@@ -90,11 +90,6 @@
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ0bF7fBeoRPVpNCpYSrmaUeExR5u47gnwSw2C5b1rBv root at osuosl2-amd64
time: future
-- hostname: osuosl3-amd64.debian.net
- ip: 140.211.9.211
- port: 22
- keys:
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMe7sAL+XwHV+C1xS2pEsB6vrvIa5z1/FBL5SbMkhkLK root at osuosl3-amd64
- hostname: osuosl31-amd64.debian.net
ip: 140.211.167.252
port: 22
=====================================
update_jdn.sh
=====================================
@@ -91,9 +91,9 @@ user_host_groups['holger','*']="$sudo_groups"
user_host_groups['holger','jenkins']="reproducible,${user_host_groups['holger','*']}"
user_host_groups['mattia','*']="$sudo_groups"
user_host_groups['mattia','jenkins']="reproducible,${user_host_groups['mattia','*']}"
-user_host_groups['jelmer','osuosl3-amd64']="$sudo_groups"
+user_host_groups['jelmer','osuosl32-amd64']="$sudo_groups"
user_host_groups['phil','jenkins']="$sudo_groups"
-user_host_groups['phil','osuosl3-amd64']="$sudo_groups"
+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"
@@ -102,13 +102,9 @@ 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['bubu','osuosl3-amd64']="$sudo_groups"
-#user_host_groups['hans','osuosl3-amd64']="$sudo_groups"
-#user_host_groups['flx','osuosl3-amd64']="$sudo_groups"
-#user_host_groups['jspricke','osuosl3-amd64']="$sudo_groups"
user_host_groups['vagrant','*']="$sudo_groups"
user_host_groups['fpierret','osuosl5-amd64']="$sudo_groups"
-user_host_groups['rclobus','osuosl3-amd64']="$sudo_groups"
+user_host_groups['rclobus','osuosl31-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"
@@ -409,8 +405,7 @@ if [ -f /etc/debian_version ] ; then
*) DEBS="$DEBS fail2ban" ;;
esac
case $HOSTNAME in
- # needed for rebuilding Debian (using .buildinfo files)
- osuosl3*) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild"
+ osuosl31*)
DEBS="$DEBS live-build" # needed for live-build
DEBS="$DEBS swtpm" # needed for openqa-worker
DEBS="$DEBS cdebootstrap cdebootstrap-static" ;; # needed for testing just that
@@ -441,19 +436,19 @@ if [ -f /etc/debian_version ] ; then
esac
# for josch's mmdebstrap-jenkins-worker
case $HOSTNAME in
- osuosl3*) DEBS="$DEBS
+ osuosl31*) DEBS="$DEBS
binfmt-support
" ;;
esac
# for janitor
case $HOSTNAME in
- osuosl3*) DEBS="$DEBS
+ osuosl32*) DEBS="$DEBS
docker.io
" ;;
esac
# notifications are only done from a few nodes
case $HOSTNAME in
- jenkins|ionos*|osuosl3*) DEBS="$DEBS
+ jenkins|ionos*|osuosl31*) DEBS="$DEBS
kgb-client
python3-yaml" ;;
*) ;;
@@ -502,7 +497,8 @@ if [ -f /etc/debian_version ] ; then
*) ;;
esac
case $HOSTNAME in
- osuosl3-amd64)
+ osuosl31-amd64)
+ # openqa
PREDEBS="$PREDEBS
fasttrack-archive-keyring"
DEBS="$DEBS
@@ -823,8 +819,7 @@ fi
# add some users to groups after packages have been installed
if ! $UP2DATE ; then
case $HOSTNAME in
- osuosl3-amd64) sudo adduser jenkins sbuild
- sudo adduser jenkins docker
+ osuosl31-amd64) sudo adduser jenkins sbuild
# openqa does not use slirpvde: reset its status and disable
sudo systemctl reset-failed openqa-slirpvde.service
sudo systemctl disable --now openqa-slirpvde.service
@@ -843,6 +838,9 @@ if ! $UP2DATE ; then
sudo systemctl enable --now $unit
done
;;
+ osuosl32-amd64) # janitor
+ sudo adduser jenkins docker
+ ;;
XXXXosuosl4-amd64) # we dont have a host supporting this anymore
# allow vagrant to use libvirt for debugging
sudo adduser vagrant libvirt
@@ -1045,7 +1043,7 @@ fi
#
# generate the kgb-client configurations
#
-if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] || [ "$HOSTNAME" = "osuosl3-amd64" ] ; then
+if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] || [ "$HOSTNAME" = "osuosl31-amd64" ] ; then
cd $BASEDIR
KGB_SECRETS="/srv/jenkins/kgb/secrets.yml"
sudo mkdir -p $(dirname $KGB_SECRETS)
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/954163a95de72f91043e48b788334e70edf5581b
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/954163a95de72f91043e48b788334e70edf5581b
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/20250922/68be92d1/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list