diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-04-15 12:16:42 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-04-15 12:16:42 +0200 |
| commit | 74ad08136faa03043e19e732b2629350fce25781 (patch) | |
| tree | 478214a703db7168cc131ef5475f7f1585e5df45 | |
| parent | 5c0675f925d2227068868fb86c5a6d1cc84de243 (diff) | |
| download | jenkins.debian.net-74ad08136faa03043e19e732b2629350fce25781.tar.xz | |
remove education-desktop-sugar related jobs from sid and jessie (see #782504)
| -rwxr-xr-x | job-cfg/chroot-installation.yaml.py | 3 | ||||
| -rw-r--r-- | job-cfg/g-i-installation.yaml | 11 |
2 files changed, 3 insertions, 11 deletions
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py index 6c5b49a4..87b62531 100755 --- a/job-cfg/chroot-installation.yaml.py +++ b/job-cfg/chroot-installation.yaml.py @@ -77,6 +77,9 @@ def get_targets_in_distro(distro, targets): # qt5, education-desktop-mate and cinnamon weren't in wheezy if distro == 'wheezy' and ( target == 'education-desktop-mate' or target == 'cinnamon' or target == 'qt5' ): continue + # sugar has been removed from jessie and thus education-desktop-sugar has been removed from jessie and sid + if (distro == 'sid' or distro == 'jessie') and ( target == 'education-desktop-sugar' ): + continue targets_in_distro.append(target) return targets_in_distro diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index 486c015a..fc573016 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -121,10 +121,6 @@ defaults: g-i-installation name: '{name}_debian-edu_wheezy_main-server' -#- job-template: -# defaults: g-i-installation -# name: '{name}_debian-edu_jessie_sugar' - - job-template: defaults: g-i-installation name: '{name}_debian_jessie_xfce' @@ -368,13 +364,6 @@ my_time: '42 2 16 * *' my_trigger: '' my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org' -# - '{name}_debian-edu_jessie_sugar': -# my_title: 'Debian Edu (jessie) sugar' -# my_shell: '/srv/jenkins/bin/g-i-installation.sh 25 http://ftp.skolelinux.org/cd-jessie-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso' -# my_description: 'Do a fully automated installation of a Debian Edu Jessie sugar profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie_sugar_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.' -# my_time: '42 2 * * 3,7' -# my_trigger: '' -# my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org' - '{name}_debian_wheezy_kde': my_title: 'Debian (wheezy) KDE desktop install' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://ftp.de.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/gtk/debian-installer/amd64/' |