[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: chroot-installs: drop all jessie related test jobs

[Holger Levsen]

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


Commits:
87840dae by Holger Levsen at 2019-08-30T11:22:34Z
chroot-installs: drop all jessie related test jobs

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

- - - - -
7e37c5a4 by Holger Levsen at 2019-08-30T11:23:20Z
detect chroot-installation_jessie* jobs as zombies

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
=====================================
@@ -225,7 +225,7 @@ jenkins_zombie_check() {
 	# 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|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_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|chroot-installation_jessie' || true)
 	if [ ! -z "$ZOMBIES" ] ; then
 		DIRTY=true
 		figlet 'zombies!!!'


=====================================
job-cfg/chroot-installation.yaml.py
=====================================
@@ -7,7 +7,6 @@ import string
 
 
 base_distros = [
-    'jessie',
     'stretch',
     'buster',
     'bullseye',
@@ -15,7 +14,6 @@ base_distros = [
     ]
 
 distro_upgrades = {
-    'jessie':  'stretch',
     'stretch':  'buster',
     'buster': 'bullseye',
     'bullseye': 'sid',
@@ -23,8 +21,7 @@ distro_upgrades = {
 
 # deb.debian.org runs mirror updates at 03:25, 09:25, 15:25 and 21:25 UTC and usually they run 10m...
 trigger_times = {
-    'jessie':  '30 16 1 */2 *',
-    'stretch':  '30 10 7,28 * *',
+    'stretch':  '30 10 1 */2 *',
     'buster': '30 10 4,11,18,25 * *',
     'bullseye': '30 10 */3 * *',
     'sid':     '30 4 * * *',
@@ -84,7 +81,6 @@ all_targets = [
    'education-services',
    'education-standalone',
    'education-thin-client',
-   'education-thin-client-server',
    'education-roaming-workstation',
    'education-video',
    'education-workstation',
@@ -102,29 +98,17 @@ all_targets = [
 # not all packages are available in all distros
 #
 def is_target_in_distro(distro, target):
-    # education-ltsp-server and education-roaming-workstation are only available since stretch…
-    if distro in ('jessie') and target in ('education-ltsp-server', 'education-roaming-workstation'):
-        return False
-    # education-thin-client-server is obsolete since stretch…
-    elif distro not in ('jessie') and target == 'education-thin-client-server':
-        return False
     # education-services is obsolete since buster…
-    elif distro not in ('jessie', 'stretch') and target == 'education-services':
-        return False
-    # lxqt is only available since stretch
-    elif distro in ('jessie') and target == 'lxqt':
+    if distro not in ('stretch') and target == 'education-services':
         return False
     # education-lang-* packages only exist in stretch
     elif distro not in ('stretch') and target[:15] == 'education-lang-':
         return False
-    # parl-desktop* and design-desktop* packages only exist since stretch
-    elif distro in ('jessie') and (target[:12] == 'parl-desktop' or target[:14] == 'design-desktop'):
-        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 ('jessie', 'stretch') and target in ('education-desktop-lxqt', 'education-primaryschool', 'education-video'):
+    elif distro in ('stretch') and target in ('education-desktop-lxqt', 'education-primaryschool', 'education-video'):
         return False
     return True
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/1203b21f60768e58fe46e131eeef672a94f16894...7e37c5a44f72ae243b4f8556a132507f5bbef7fe

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/1203b21f60768e58fe46e131eeef672a94f16894...7e37c5a44f72ae243b4f8556a132507f5bbef7fe
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/20190830/c11770ab/attachment-0001.html>