summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-04-07 14:21:50 +0200
committerHolger Levsen <holger@layer-acht.org>2017-04-07 14:31:37 +0200
commitde3d0bf5a6c2a29300d7130c7dbfc8d447b4e18c (patch)
treed9ca33ca460bb6f7c59b46fe8b537d648c1b9276
parenta878c6d69aa1951a6accfbc6b88768c75bcb41c2 (diff)
downloadjenkins.debian.net-de3d0bf5a6c2a29300d7130c7dbfc8d447b4e18c.tar.xz
chroot-installation: refactor pyton to generate yaml
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index 1a151457..ac94c248 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -83,16 +83,16 @@ all_targets = [
#
def is_target_in_distro(distro, target):
# qt5, education-desktop-mate and cinnamon weren't in wheezy. debconf-video is not interested in wheezy anymore neither
- if distro == 'wheezy' and ( target == 'education-desktop-mate' or target == 'cinnamon' or target == 'qt5' or target == 'debconf-video' ):
+ if distro == 'wheezy' and target in ('education-desktop-mate', 'cinnamon', 'qt5', 'debconf-video'):
return False
# sugar has been removed from jessie and thus education-desktop-sugar has been removed from jessie and sid - it's also not yet available in stretch again...
- elif (distro == 'sid' or distro == 'jessie' or distro == 'stretch') and ( target == 'education-desktop-sugar' ):
+ elif distro in ('sid', 'jessie', 'stretch') and target == 'education-desktop-sugar':
return False
# education-ltsp-server has just been introduced in sid…
- elif (distro == 'wheezy' or distro == 'jessie' or distro == 'stretch') and ( target == 'education-ltsp-server' ):
+ elif distro in ('wheezy', 'jessie', 'stretch') and target == 'education-ltsp-server':
return False
# education-thin-client-server will become obsolete in stretch…
- elif (distro == 'sid') and ( target == 'education-thin-client-server' ):
+ elif distro == 'sid' and target == 'education-thin-client-server':
return False
return True