diff options
| -rwxr-xr-x | bin/reproducible_node_health_check.sh | 2 | ||||
| -rwxr-xr-x | job-cfg/chroot-installation.yaml.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/reproducible_node_health_check.sh b/bin/reproducible_node_health_check.sh index 4f5b868d..0771c0c6 100755 --- a/bin/reproducible_node_health_check.sh +++ b/bin/reproducible_node_health_check.sh @@ -145,7 +145,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then # and we dont know why and when that happens, # so just report those zombies here. # - ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|ff64a|jtk1a|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles' || true) + ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|ff64a|jtk1a|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services' || true) if [ ! -z "$ZOMBIES" ] ; then echo "Warning, rise of the jenkins job zombies has started again, these jobs should not exist:" for z in $ZOMBIES ; do diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py index d99c734f..2616f750 100755 --- a/job-cfg/chroot-installation.yaml.py +++ b/job-cfg/chroot-installation.yaml.py @@ -108,6 +108,9 @@ def is_target_in_distro(distro, target): # education-thin-client-server is obsolete since stretch… elif distro in ('sid', 'buster', 'stretch') and target == 'education-thin-client-server': return False + # education-services is obsolete since buster… + elif distro in ('sid', 'buster') and target == 'education-services': + return False # education-lang-*, parl-desktop* and design-desktop* packages only exist since stretch elif distro in ('jessie') and (target[:15] == 'education-lang-' or target[:12] == 'parl-desktop' or target[:14] == 'design-desktop'): return False |