bin/reproducible_db_maintenance.py

@@ -613,7 +613,7 @@ schema_updates = {
         for t in ("sources", "stats_pkg_state", "stats_builds_per_day",
                   "stats_builds_age", "stats_meta_pkg_state", "stats_build")
     ],
-    32: [  # copy stretch packages (includng results) in buster
+    32: [  # copy stretch packages (including results) in buster
         """INSERT INTO sources (name, version, suite, architecture, notify_maintainer)
             SELECT name, version, 'buster', architecture, notify_maintainer
             FROM sources
@@ -694,7 +694,7 @@ schema_updates = {
         "UPDATE results SET status='reproducible' WHERE status='GOOD'",
         "UPDATE results SET status='blacklisted' WHERE status='BLACKLISTED'"
     ],
-    44: [  # copy buster packages (includng results) in bullseye
+    44: [  # copy buster packages (including results) in bullseye
         """INSERT INTO sources (name, version, suite, architecture, notify_maintainer, distribution)
             SELECT name, version, 'bullseye', architecture, notify_maintainer, distribution
             FROM sources

job-cfg/packages-tests.yaml

@@ -48,11 +48,13 @@
           regular-expression: '^ERROR: Error cloning remote repo'
     my_default_distro_matrix: &distros_defaults
       - sid: &distro_defaults_sid
-          my_trigger: '{name}_buster'
+          my_trigger: '{name}_bullseye'
           my_origin_triggers: &default_git_triggers
             - pollscm:
                 cron: '15,30,45,60 * * * *'
-      - buster: &distro_defaults_buster
+      - bullseye: &distro_defaults_bullseye
+          my_trigger: '{name}_buster'
+      - buster: &distro_defaults_buster {}
           my_trigger: '{name}_stretch'
       - stretch: &distro_defaults_stretch {}
 
@@ -90,8 +92,12 @@
           my_origin_triggers:
             - gitlab:
                 secret-token: '{{AQAAABAAAAAwUn9vCBPUfLVePuJ0YzGIefo56GNDCX04sk6uDaZRv9lXSlGM1xzrj3Lap8neBcCtFzq6OoqwTUKfRQggb6tu4Q==}}'
+      - bullseye:
+          <<: *distro_defaults_bullseye
       - buster:
           <<: *distro_defaults_buster
+      - buster-backports:
+          <<: *distro_defaults_buster
           my_trigger: '{name}_stretch-backports'
       - stretch:
           <<: *distro_defaults_stretch
@@ -109,8 +115,8 @@
     my_description: 'debian-archive-keyring testsuite'
     my_distro:
       - sid: *distro_defaults_sid
-      - buster: *distro_defaults_buster
-      - stretch: {}
+      - bullseye: *distro_defaults_bullseye
+      - buster: {}
     jobs:
       - simple
 
@@ -122,7 +128,7 @@
     my_description: 'Debian/Debsums testsuite'
     my_distro:
       - sid: *distro_defaults_sid
-      - buster: *distro_defaults_buster
-      - stretch: {}
+      - bullseye: *distro_defaults_bullseye
+      - buster: {}
     jobs:
       - simple

update_jdn.sh

@@ -794,11 +794,12 @@ if [ "$HOSTNAME" = "jenkins" ] ; then
 	# and we dont know why and when that happens,
 	# so just report those zombies here.
 	#
-	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|odc2a|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|piuparts_.*_jessie|udd_stretch' || 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|odc2a|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|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch' || true)
 	if [ ! -z "$ZOMBIES" ] ; then
 		figlet 'zombies!!!'
 		echo "Warning, rise of the jenkins job zombies has started again, these jobs should not exist:"
 		for z in $ZOMBIES ; do
+
 			echo $(basename $z)
 		done
 		echo