summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-12-05 17:02:14 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-05 17:02:14 +0100
commit0c5a701d6c7ea790d0c87e0f65e091034ceedb5f (patch)
treec30cd58b2f120367326fb214b126a24a044beb86
parent1c71910fe4d352775b1ab8136214da8b6f6328bc (diff)
downloadjenkins.debian.net-0c5a701d6c7ea790d0c87e0f65e091034ceedb5f.tar.xz
chroot-installation: cinnamon was not available on squeeze nor wheezy
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index e3fc1513..95916448 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -69,11 +69,11 @@ targets = """
def get_targets_in_distro(distro, targets):
targets_in_distro = []
for target in targets:
- # haskell and edu tests not in squeeze
- if distro == 'squeeze' and ( target == 'haskell' or target[:10] == 'education-'):
+ # haskell, cinnamon and edu tests not in squeeze
+ if distro == 'squeeze' and ( target == 'haskell' or target[:10] == 'education-' or target == 'cinnamon' ):
continue
- # education-desktop-mate wasn't in wheezy
- if distro == 'wheezy' and target == 'education-desktop-mate':
+ # education-desktop-mate and cinnamon weren't in wheezy
+ if distro == 'wheezy' and ( target == 'education-desktop-mate' or target == 'cinnamon' ):
continue
targets_in_distro.append(target)
return targets_in_distro
@@ -86,7 +86,7 @@ def get_recipients(target):
return 'holger@layer-acht.org' # FIXME: this should be jenkins-maintainers@lists.somewhere
elif target == 'haskell':
return 'jenkins+debian-haskell holger@layer-acht.org pkg-haskell-maintainers@lists.alioth.debian.org'
- elif target[:8] == 'cinnamon':
+ elif target == 'cinnamon':
return 'jenkins+debian-cinnamon pkg-cinnamon-team@lists.alioth.debian.org holger@layer-acht.org'
elif target[:3] == 'kde':
return 'jenkins+debian-qa debian-qt-kde@lists.debian.org holger@layer-acht.org'