summaryrefslogtreecommitdiffstats
path: root/job-cfg
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-06-21 15:17:32 +0200
committerHolger Levsen <holger@layer-acht.org>2017-06-21 15:17:32 +0200
commit2c594fc250daf216d4ca89d5c287f04e9ae792b2 (patch)
tree49bb30866a3c484c83130318fcafc23660153045 /job-cfg
parentd777836d5b899ed76250105f391485ce828362d7 (diff)
downloadjenkins.debian.net-2c594fc250daf216d4ca89d5c287f04e9ae792b2.tar.xz
chroot-installation: drop tests for education-desktop-sugar (despite sugar is back in stable, I doubt we'll add back education-desktop-sugar to Debian Edu)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'job-cfg')
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index a193441c..73a83dbe 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -55,7 +55,6 @@ all_targets = [
'education-desktop-lxde',
'education-desktop-mate',
'education-desktop-other',
- 'education-desktop-sugar',
'education-desktop-xfce',
'education-development',
'education-electronics',
@@ -100,11 +99,8 @@ all_targets = [
# not all packages are available in all distros
#
def is_target_in_distro(distro, target):
- # sugar has been removed from jessie and thus education-desktop-sugar has been removed from jessie and sid...
- if distro in ('sid', 'jessie', 'stretch') and target == 'education-desktop-sugar':
- return False
# education-ltsp-server and education-roaming-workstation are only availble since stretch…
- elif distro in ('jessie') and target in ('education-ltsp-server', 'education-roaming-workstation'):
+ 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 in ('sid', 'buster') and target == 'education-thin-client-server':