[Git][qa/jenkins.debian.net][master] t.r-b.o/d: continue WIP: add forky, archive bullseye

Holger Levsen (@holger) gitlab at salsa.debian.org
Tue Aug 12 15:35:07 BST 2025



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


Commits:
701c8707 by Holger Levsen at 2025-08-12T16:34:57+02:00
t.r-b.o/d: continue WIP: add forky, archive bullseye

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

- - - - -


4 changed files:

- TODO.forky
- TODO.trixie
- bin/reproducible_json.py
- bin/reproducible_scheduler.py


Changes:

=====================================
TODO.forky
=====================================
@@ -25,15 +25,14 @@ this is the stuff which needs to be done when forky has been released.
 ** adjust scheduler
 ** restart jenkins, run the duke pbuilder and chroot jobs
 ** run the maintenance jobs (to create the chdist)
-** once the above jobs are successful, restarts the builders
+** once the above jobs are successful, restart the builders
 ** adopt whatever suite specific hacks _create_meta_pkg_sets.sh has
 ** tweak reproducible_common.sh in three locations to start collect statistics on the daily builds for duke too (and make_graph.py too: (in lines 40 and 54++)
 ** create reproducible_(cdeboot|deboot|mmdeb)strap jobs for duke and drop bookworm ones
 ** create reproducible_debian_live_build jobs for duke and drop bookworm ones
 ** add reproducible_debian_live_build.*duke to reproducible_html_nodes_info.sh
 ** adjust reproducible_json.py so that it exports data for duke
-** add duke to the suites in reproducible_pool_buildinfos.sh
-** add duke to ~buildinfo/builtin-pho/dists.txt on ionos7
+** add duke to ~buildinfo/builtin-pho/dists.txt on ionos7 (and drop bookworm)
 ** adjust chroot_installation- jobs
 ** tweak jenkins-shell-monitor.sh as needed
 ** add duke to URL redirects in hosts/jenkins/etc/apache2/reproduciblemap.conf


=====================================
TODO.trixie
=====================================
@@ -1,23 +1,16 @@
 
 == ToDo for a new Debian release
 
-
-=== Things which have been done already:
-
+* 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:
 ** pause building: touch `NO-RB-BUILDERS-PLEASE`, shutdown build at service, reproducible_cleanup_nodes.sh and place jenkins in quiet-down.
-** adjust scheduler
 ** restart jenkins, run the trixie pbuilder and chroot jobs
 ** run the maintenance jobs (to create the chdist)
 ** once the above jobs are successful, restarts the builders
-** adopt whatever suite specific hacks _create_meta_pkg_sets.sh has
 ** tweak reproducible_common.sh in three locations to start collect statistics on the daily builds for trixie too (and make_graph.py too: (in lines 40 and 54++)
 ** 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 reproducible_json.py so that it exports data for trixie
-** add trixie to the suites in reproducible_pool_buildinfos.sh
-** add trixie to ~buildinfo/builtin-pho/dists.txt on ionos7
 ** adjust chroot_installation- jobs
 ** tweak jenkins-shell-monitor.sh as needed
 ** add trixie to URL redirects in hosts/jenkins/etc/apache2/reproduciblemap.conf
@@ -28,22 +21,6 @@
 ** 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
-** upgrade amd64 nodes to bookworm (except jenkins)
-*** see below for how to upgrade to postgresql-15 on ionos7
-** upgrade armhf nodes to bookworm
-** upgrade jenkins to bookworm
-** upgrade to postgresql-15:
-----
-# as root:
-apt install postgresql-15
-pg_lsclusters
-pg_dropcluster --stop 15 main
-pg_lsclusters
-pg_upgradecluster 13 main
-pg_lsclusters
-# test test test
-apt purge postgresql-13
-----
 
 
 // vim: set filetype=asciidoc:


=====================================
bin/reproducible_json.py
=====================================
@@ -61,7 +61,7 @@ for row in result:
     output.append(pkg)
 
     # tracker.d.o should only care about results in testing
-    if pkg['suite'] == 'trixie':
+    if pkg['suite'] == 'forky':
 
         if pkg["status"] in ("E404", "NFU", "blacklisted"):
             # don't export these states in reproducible-tracker.json


=====================================
bin/reproducible_scheduler.py
=====================================
@@ -74,91 +74,91 @@ MAXIMA = {'amd64': 4000, 'arm64': 4000, 'armhf': 2500}
 LIMITS = {
     'untested': {
         'amd64': {
-            'bullseye': {'*': 255},
             'bookworm': {'*': 255},
             'trixie': {'*': 255},
+            'forky': {'*': 255},
             'unstable': {'*': 255},
             'experimental': {'*': 255},
         },
         'arm64': {
-            'bullseye': {'*': 255},
             'bookworm': {'*': 255},
             'trixie': {'*': 255},
+            'forky': {'*': 255},
             'unstable': {'*': 255},
             'experimental': {'*': 255},
         },
         'armhf': {
-            'bullseye': {'*': 255},
             'bookworm': {'*': 255},
             'trixie': {'*': 255},
+            'forky': {'*': 255},
             'unstable': {'*': 255},
             'experimental': {'*': 255},
         },
     },
     'new': {
         'amd64': {
-            'bullseye': {1: (1000, 200), 2: (1500, 200), '*': 100},
             'bookworm': {1: (1000, 200), 2: (1500, 200), '*': 100},
-            'trixie': {1: (1000, 750), 2: (1500, 500), '*': 150},
+            'trixie': {1: (1000, 200), 2: (1500, 200), '*': 100},
+            'forky': {1: (1000, 750), 2: (1500, 500), '*': 150},
             'unstable': {1: (1000, 750), 2: (1500, 500), '*': 250},
             'experimental': {1: (1000, 750), 2: (1500, 500), '*': 50},
         },
         'arm64': {
-            'bullseye': {1: (1000, 200), 2: (1500, 200), '*': 100},
             'bookworm': {1: (1000, 200), 2: (1500, 200), '*': 100},
-            'trixie': {1: (1000, 750), 2: (1750, 500), '*': 150},
+            'trixie': {1: (1000, 200), 2: (1500, 200), '*': 100},
+            'forky': {1: (1000, 750), 2: (1750, 500), '*': 150},
             'unstable': {1: (1000, 750), 2: (1750, 500), '*': 250},
             'experimental': {1: (1000, 750), 2: (1750, 500), '*': 50},
         },
         'armhf': {
-            'bullseye': {1: (900, 100), 2: (1400, 100), '*': 50},
             'bookworm': {1: (900, 100), 2: (1400, 100), '*': 50},
-            'trixie': {1: (1000, 600), 2: (1400, 400), '*': 100},
+            'trixie': {1: (900, 100), 2: (1400, 100), '*': 50},
+            'forky': {1: (1000, 600), 2: (1400, 400), '*': 100},
             'unstable': {1: (1000, 600), 2: (1400, 400), '*': 150},
             'experimental': {1: (1000, 500), 2: (1400, 300), '*': 50},
         },
     },
     'ftbfs': {
         'amd64': {
-            'bullseye': {1: (1000, 0), 2: (1500, 0), '*': 0},
             'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
-            'trixie': {1: (1000, 40), 2: (1500, 20), '*': 5},
+            'trixie': {1: (1000, 0), 2: (1500, 0), '*': 0},
+            'forky': {1: (1000, 40), 2: (1500, 20), '*': 5},
             'unstable': {1: (1000, 40), 2: (1500, 20), '*': 5},
             'experimental': {1: (1000, 30), 2: (1500, 15), '*': 2},
         },
         'arm64': {
-            'bullseye': {1: (1000, 0), 2: (1500, 0), '*': 0},
             'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
-            'trixie': {1: (1000, 40), 2: (1500, 20), '*': 5},
+            'trixie': {1: (1000, 0), 2: (1500, 0), '*': 0},
+            'forky': {1: (1000, 40), 2: (1500, 20), '*': 5},
             'unstable': {1: (1000, 40), 2: (1500, 20), '*': 5},
             'experimental': {1: (1000, 30), 2: (1500, 15), '*': 2},
         },
         'armhf': {
-            'bullseye': {1: (900, 0), 2: (1400, 0), '*': 0},
             'bookworm': {1: (900, 0), 2: (1400, 0), '*': 0},
-            'trixie': {1: (1000, 30), 2: (1400, 15), '*': 5},
+            'trixie': {1: (900, 0), 2: (1400, 0), '*': 0},
+            'forky': {1: (1000, 30), 2: (1400, 15), '*': 5},
             'unstable': {1: (1000, 30), 2: (1400, 15), '*': 2},
             'experimental': {1: (1000, 15), 2: (1400, 10), '*': 2},
         }
     },
     'depwait': {
         'amd64': {
-            'bullseye': {1: (1000, 200), 2: (1500, 100), '*': 0},
             'bookworm': {1: (1000, 200), 2: (1500, 100), '*': 0},
-            'trixie': {1: (1000, 400), 2: (1500, 200), '*': 5},
+            'trixie': {1: (1000, 200), 2: (1500, 100), '*': 0},
+            'forky': {1: (1000, 400), 2: (1500, 200), '*': 5},
             'unstable': {1: (1000, 400), 2: (1500, 200), '*': 5},
             'experimental': {1: (1000, 400), 2: (1500, 200), '*': 2},
         },
         'arm64': {
-            'bullseye': {1: (1000, 200), 2: (1500, 100), '*': 0},
             'bookworm': {1: (1000, 200), 2: (1500, 100), '*': 0},
-            'trixie': {1: (1000, 400), 2: (1500, 200), '*': 5},
+            'trixie': {1: (1000, 200), 2: (1500, 100), '*': 0},
+            'forky': {1: (1000, 400), 2: (1500, 200), '*': 5},
             'unstable': {1: (1000, 400), 2: (1500, 200), '*': 5},
             'experimental': {1: (1000, 400), 2: (1500, 200), '*': 2},
         },
         'armhf': {
-            'bullseye': {1: (900, 200), 2: (1400, 100), '*': 0},
             'bookworm': {1: (900, 200), 2: (1400, 100), '*': 0},
+            'trixie': {1: (900, 200), 2: (1400, 100), '*': 0},
             'trixe': {1: (900, 400), 2: (1400, 200), '*': 5},
             'unstable': {1: (900, 400), 2: (1400, 200), '*': 5},
             'experimental': {1: (900, 100), 2: (1400, 50), '*': 2},
@@ -166,23 +166,23 @@ LIMITS = {
     },
     'old': {
         'amd64': {
-            'bullseye': {1: (1000, 0), 2: (1500, 0), '*': 0},
             'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
-            'trixie': {1: (1000, 1200), 2: (1500, 1000), '*': 0},
+            'trixie': {1: (1000, 0), 2: (1500, 0), '*': 0},
+            'forky': {1: (1000, 1200), 2: (1500, 1000), '*': 0},
             'unstable': {1: (1000, 1300), 2: (1500, 1000), '*': 0},
             'experimental': {1: (1000, 75), 2: (1500, 50), '*': 0},
         },
         'arm64': {
-            'bullseye': {1: (1000, 0), 2: (1500, 0), '*': 0},
             'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
-            'trixie': {1: (1000, 1200), 2: (1500, 1000), '*': 0},
+            'trixie': {1: (1000, 0), 2: (1500, 0), '*': 0},
+            'forky': {1: (1000, 1200), 2: (1500, 1000), '*': 0},
             'unstable': {1: (1000, 1300), 2: (1500, 1000), '*': 0},
             'experimental': {1: (1000, 75), 2: (1500, 50), '*': 0},
         },
         'armhf': {
-            'bullseye': {1: (900, 0), 2: (1400, 0), '*': 0},
-            'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
-            'trixie': {1: (1000, 1000), 2: (1500, 750), '*': 0},
+            'bookworm': {1: (900, 0), 2: (1400, 0), '*': 0},
+            'trixie': {1: (1000, 0), 2: (1500, 0), '*': 0},
+            'forky': {1: (1000, 1000), 2: (1500, 750), '*': 0},
             'unstable': {1: (1000, 1000), 2: (1500, 750), '*': 0},
             'experimental': {1: (1000, 40), 2: (1500, 20), '*': 0},
         }



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/701c87076056e041f437b65d610a4cf57dd06ed3
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/20250812/57a72701/attachment-0001.htm>


More information about the Qa-jenkins-scm mailing list