[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] chroot installation tests: add bookworm jobs, drop drop stretch jobs

[Holger Levsen (@holger)]

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


Commits:
2c7f450e by Holger Levsen at 2021-08-17T17:54:27+02:00
chroot installation tests: add bookworm jobs, drop drop stretch jobs

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

- - - - -


2 changed files:

- bin/common-functions.sh
- job-cfg/chroot-installation.yaml.py


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -224,7 +224,7 @@ jenkins_zombie_check() {
 	# related however is that I issued a reboot (via running 
 	# /sbin/reboot) right before the zombies appeared...
 	#
-	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|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|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|^g-i|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c|ar71xx|reproducible_debian_live_build$' || 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|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|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|^g-i|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c|ar71xx|reproducible_debian_live_build$|chroot-installation_stretch' || true)"
 	if [ ! -z "$ZOMBIES" ] ; then
 		DIRTY=true
 		figlet 'zombies!!!'


=====================================
job-cfg/chroot-installation.yaml.py
=====================================
@@ -5,23 +5,23 @@ import sys
 import yaml
 
 base_distros = [
-    'stretch',
     'buster',
     'bullseye',
+    'bookworm',
     'sid',
     ]
 
 distro_upgrades = {
-    'stretch':  'buster',
-    'buster': 'bullseye',
-    'bullseye': 'sid',
+    'buster':  'bullseye',
+    'bullseye': 'bookworm',
+    'bookworm': 'sid',
     }
 
 # deb.debian.org runs mirror updates at 03:25, 09:25, 15:25 and 21:25 UTC and usually they run 10m...
 trigger_times = {
-    'stretch':  '30 10 1 */2 *',
-    'buster': '30 10 4,11,18,25 * *',
-    'bullseye': '30 10 */3 * *',
+    'buster':  '30 10 1 */2 *',
+    'bullseye': '30 10 4,11,18,25 * *',
+    'bookworm': '30 10 */3 * *',
     'sid':     '30 4 * * *',
     }
 
@@ -67,7 +67,6 @@ all_targets = [
    'education-networked',
    'education-physics',
    'education-primaryschool',
-   'education-services',
    'education-standalone',
    'education-thin-client',
    'education-roaming-workstation',
@@ -87,17 +86,8 @@ all_targets = [
 # not all packages are available in all distros
 #
 def is_target_in_distro(distro, target):
-    # education-services is obsolete since buster…
-    if distro not in ('stretch') and target == 'education-services':
-        return False
-    # parl-desktop* packages have been removed from stretch.
-    elif distro in ('stretch') and target[:12] == 'parl-desktop':
-        return False
-    # education-desktop-lxqt, education-primaryschool and education-video packages only exist since buster
-    elif distro in ('stretch') and target in ('education-desktop-lxqt', 'education-primaryschool', 'education-video'):
-        return False
     # education-desktop-cinnamon only exists since bullseye
-    elif distro in ('stretch', 'buster') and target in ('education-desktop-cinnamon'):
+    if distro in ('buster') and target in ('education-desktop-cinnamon'):
         return False
     return True
 
@@ -129,7 +119,7 @@ def get_view(target, distro):
     if target == 'haskell':
         return 'haskell'
     elif target[:10] == 'education-':
-        if distro in ('stretch', 'buster'):
+        if distro in ('buster', 'bullseye'):
             return 'edu_stable'
         else:
             return 'edu_devel'



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/2c7f450ed5c2ec7c26ef577ccde0539af5f35ff1
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/20210817/b4140916/attachment-0001.htm>