[Git][qa/jenkins.debian.net][master] t.r-b.o/d: continue WIP, more forky adding and bullseye removals
Holger Levsen (@holger)
gitlab at salsa.debian.org
Wed Aug 13 16:03:50 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
4aecebd2 by Holger Levsen at 2025-08-13T17:03:39+02:00
t.r-b.o/d: continue WIP, more forky adding and bullseye removals
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
9 changed files:
- TODO.forky
- TODO.trixie
- bin/common-functions.sh
- bin/jenkins-shell-monitor.sh
- bin/maintenance.sh
- bin/reproducible_html_nodes_info.sh
- bin/reproducible_maintenance.sh
- hosts/jenkins/etc/apache2/reproduciblemap.conf
- job-cfg/reproducible.yaml
Changes:
=====================================
TODO.forky
=====================================
@@ -38,7 +38,7 @@ this is the stuff which needs to be done when forky has been released.
** adjust reproducible_json.py so that it exports data for duke
** add duke to ~buildinfo/builtin-pho/dists.txt on ionos7 (and drop bookworm)
** adjust chroot_installation- jobs
-** tweak jenkins-shell-monitor.sh as needed
+** tweak jenkins-shell-monitor.sh as needed in two places
** add duke to URL redirects in hosts/jenkins/etc/apache2/reproduciblemap.conf
** adjust multiarch jobs in job-cfg/udd.yaml
** add chroot-installation duke jobs to build_jenkins_job_health_page in maintenance.sh
=====================================
TODO.trixie
=====================================
@@ -2,20 +2,9 @@
== ToDo, after we released trixie
* on jenkins and ionos7 once we are sure they run fine: pg_dropcluster 15 main
-* things to do when bookworm been released and trixie is open for development:
-** create reproducible_(cdeboot|deboot|mmdeb)strap jobs for trixie
-** create reproducible_debian_live_build jobs for trixie
-** add reproducible_debian_live_build.*trixie to reproducible_html_nodes_info.sh
-** adjust chroot_installation- jobs
-** tweak jenkins-shell-monitor.sh as needed
-** add trixie to URL redirects in hosts/jenkins/etc/apache2/reproduciblemap.conf
-** adjust multiarch jobs in job-cfg/udd.yaml
-** add chroot-installation trixie jobs to build_jenkins_job_health_page in maintenance.sh
-** add trixie jobs in jobs/dpkg.yaml to find dpkg trigger cycles, drop bookworm ones
-** update find_obsolete_transitional_packages.sh and job-cfg/obsolete-transitional.yaml
-** add trixie jobs in job-cfg/packages-tests.yaml, drop buster ones
-** add trixie jobs in job-cfg/piuparts.yaml, drop buster ones
-** update suite names in README
-
+* update find_obsolete_transitional_packages.sh and job-cfg/obsolete-transitional.yaml
+* add trixie jobs in job-cfg/packages-tests.yaml, drop buster ones
+* add trixie jobs in job-cfg/piuparts.yaml, drop buster ones
+* update suite names in README
// vim: set filetype=asciidoc:
=====================================
bin/common-functions.sh
=====================================
@@ -237,7 +237,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_.*_(jessie|stretch|buster|bullseye)|lintian-tests|udd_stretch|d-i_pu-build|debsums-tests_(stretch|buster|bullseye)|debian-archive-keyring-tests_stretch|debian-archive-keyring-tests_buster|debian-archive-keyring-tests_bullseye|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc1[0123]($|_)|brcm47xx|rebootstrap_(kfreebsd-|nios2_)|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|archlinux|openwrt-target-(ath97|tegra)|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_bullseye*upgrade_to_sid|rebuilder_prototype|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_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|chroot-installation_bullseye|dpkg_bookworm_find_trigger_cycles|setup_pbuilder_bullseye|setup_schroot_bullseye)' || 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_.*_(jessie|stretch|buster|bullseye)|lintian-tests|udd_stretch|d-i_pu-build|debsums-tests_(stretch|buster|bullseye)|debian-archive-keyring-tests_stretch|debian-archive-keyring-tests_buster|debian-archive-keyring-tests_bullseye|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc1[0123]($|_)|brcm47xx|rebootstrap_(kfreebsd-|nios2_)|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|archlinux|openwrt-target-(ath97|tegra)|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_bullseye*upgrade_to_sid|rebuilder_prototype|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_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|chroot-installation_bullseye|dpkg_bookworm_find_trigger_cycles|setup_pbuilder_bullseye|setup_schroot_bullseye|strap_bullseye)' || true)"
if [ -n "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/jenkins-shell-monitor.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright © 2020-2024 Holger Levsen (holger at layer-acht.org)
+# Copyright © 2020-2025 Holger Levsen (holger at layer-acht.org)
# released under the GPLv2
#
#
@@ -19,9 +19,10 @@ WARNING_LEVEL['/var/lib/schroot']=70
WARNING_LEVEL['/srv/schroots']=100
WARNING_LEVEL['/srv/reproducible-results/rbuild-debian']=50
WARNING_LEVEL['r-b-userContent../dbd*/buster']=5
-WARNING_LEVEL['r-b-userContent../dbd*/bullseye']=40
+WARNING_LEVEL['r-b-userContent../dbd*/bullseye']=8
WARNING_LEVEL['r-b-userContent../dbd*/bookworm']=60
WARNING_LEVEL['r-b-userContent../dbd*/trixie']=60
+WARNING_LEVEL['r-b-userContent../dbd*/forky']=60
WARNING_LEVEL['r-b-userContent../dbd*/unstable']=145
WARNING_LEVEL['r-b-userContent../dbd*/experimental']=42
WARNING_LEVEL['live_build']=23
@@ -88,7 +89,7 @@ main_loop() {
;;
"/var/lib/jenkins/userContent/reproducible")
DIR_PATH=/var/lib/jenkins/userContent/reproducible/debian
- for i in buster bullseye bookworm trixie unstable experimental live_build ; do
+ for i in buster bullseye bookworm trixie forky unstable experimental live_build ; do
if [ "$i" = "live_build" ] ; then
DU_PATH="$i"
VISIBLE_PATH="$i"
=====================================
bin/maintenance.sh
=====================================
@@ -182,10 +182,9 @@ build_jenkins_job_health_page() {
"edu-packages"
"haskell"
"chroot-installation_sid"
+ "chroot-installation_forky"
"chroot-installation_trixie"
"chroot-installation_bookworm"
- "chroot-installation_bullseye"
- "chroot-installation_buster"
"d-i_overview"
"d-i_manual"
"d-i_build"
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -257,9 +257,9 @@ build_job_health_page() {
"reproducible_mmdebstrap"
"reproducible_debootstrap"
"reproducible_cdebootstrap"
- "reproducible_debian_live_build.*bullseye"
"reproducible_debian_live_build.*bookworm"
"reproducible_debian_live_build.*trixie"
+ "reproducible_debian_live_build.*forky"
"reproducible_debian_live_build.*sid"
"(reprotest|strip-nonderminism|disorderfs)"
"(json|le_scheduler|meta|le_nodes|rsync|notes)"
=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -448,8 +448,8 @@ fi
echo "$(date -u) - Checking for files with bad permissions."
# automatically fix rbuild files with wrong permissions...
# (we know it happens (very rarely) but... shrugs.)
-[ ! -d $DEBIAN_BASE/rbuild ] || find $DEBIAN_BASE/{buildinfo,dbd,dbdtxt,dbdjson,logs,logdiffs,rbuild,artifacts,buster,bullseye,bookworm,trixie,unstable,experimental,rb-pkg} -type f ! -perm 644 -exec sudo chmod -v 644 {} \; 2>/dev/null|| true
-BADPERMS=$(find $DEBIAN_BASE/{buildinfo,dbd,dbdtxt,dbdjson,logs,logdiffs,rbuild,artifacts,buster,bullseye,bookworm,trixie,unstable,experimental,rb-pkg} -type f ! -perm 644 2>/dev/null|| true)
+[ ! -d $DEBIAN_BASE/rbuild ] || find $DEBIAN_BASE/{buildinfo,dbd,dbdtxt,dbdjson,logs,logdiffs,rbuild,artifacts,buster,bullseye,bookworm,trixie,forky,unstable,experimental,rb-pkg} -type f ! -perm 644 -exec sudo chmod -v 644 {} \; 2>/dev/null|| true
+BADPERMS=$(find $DEBIAN_BASE/{buildinfo,dbd,dbdtxt,dbdjson,logs,logdiffs,rbuild,artifacts,buster,bullseye,bookworm,trixie,forky,unstable,experimental,rb-pkg} -type f ! -perm 644 2>/dev/null|| true)
if [ -n "$BADPERMS" ] ; then
DIRTY=true
echo
=====================================
hosts/jenkins/etc/apache2/reproduciblemap.conf
=====================================
@@ -99,11 +99,11 @@ RewriteRule ^/debian/testing/(.*) /debian/bullseye/$1
# redirect /$suite to /$suite/index_suite_amd64_stats.html
# note: the missing slash in the RewriteRule is wanted to avoid a double slash
-RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|trixie|unstable|experimental)(/|)$
+RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|trixie|forky|unstable|experimental)(/|)$
RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L]
# redirect /$suite/$arch to $suite/index_suite_$arch_stats.html
-RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|trixie|unstable|experimental)/(amd64|arm64|armhf)(/|)$
+RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|trixie|forky|unstable|experimental)/(amd64|arm64|armhf)(/|)$
RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L]
# redirect /$arch to /unstable/index_suite_$arch_stats.html
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -576,19 +576,19 @@
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap unstable'
my_timed: '0 7 * * *'
my_hname: 'osuosl3'
+ - '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'
- 'mmdebstrap_trixie':
my_description: 'Check mmdebstrap of trixie is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap trixie'
- my_timed: '5 7 * * *'
+ my_timed: '10 7 1 * *'
my_hname: 'osuosl3'
- 'mmdebstrap_bookworm':
my_description: 'Check mmdebstrap of bookworm is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap bookworm'
- my_timed: '10 7 1 * *'
- my_hname: 'osuosl3'
- - 'mmdebstrap_bullseye':
- my_description: 'Check mmdebstrap of bullseye is reproducible.'
- my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap bullseye'
my_timed: '15 7 1 * *'
my_hname: 'osuosl3'
- 'debootstrap_unstable':
@@ -596,19 +596,19 @@
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap unstable'
my_timed: '25 7 * * *'
my_hname: 'osuosl3'
+ - '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'
- 'debootstrap_trixie':
my_description: 'Check debootstrap of trixie is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap trixie'
- my_timed: '35 7 * * *'
+ my_timed: '45 7 1 * *'
my_hname: 'osuosl3'
- 'debootstrap_bookworm':
my_description: 'Check debootstrap of bookworm is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap bookworm'
- my_timed: '45 7 1 * *'
- my_hname: 'osuosl3'
- - 'debootstrap_bullseye':
- my_description: 'Check debootstrap of bullseye is reproducible.'
- my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh debootstrap bullseye'
my_timed: '55 7 1 * *'
my_hname: 'osuosl3'
- 'cdebootstrap_unstable':
@@ -616,19 +616,19 @@
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap unstable'
my_timed: '0 6 * * *'
my_hname: 'osuosl3'
+ - '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'
- 'cdebootstrap_trixie':
my_description: 'Check cdebootstrap of trixie is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap trixie'
- my_timed: '10 6 * * *'
+ my_timed: '20 6 1 * *'
my_hname: 'osuosl3'
- 'cdebootstrap_bookworm':
my_description: 'Check cdebootstrap of bookworm is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap bookworm'
- my_timed: '20 6 1 * *'
- my_hname: 'osuosl3'
- - 'cdebootstrap_bullseye':
- my_description: 'Check cdebootstrap of bullseye is reproducible.'
- my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh cdebootstrap bullseye'
my_timed: '30 6 1 * *'
my_hname: 'osuosl3'
- 'json':
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4aecebd22c5ecd9f65aa7d244b20246616f4dcf9
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4aecebd22c5ecd9f65aa7d244b20246616f4dcf9
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/20250813/d7aff066/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list