From 23a4df116bfeba18f23aaf1e1fe4a5e338adede1 Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Sun, 13 Dec 2015 14:32:56 +0100
Subject: get rid of hanging underscore on non-desktop edu jobs

---
 job-cfg/g-i-installation.yaml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 21c8e5b5..a3aa59b7 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -93,6 +93,10 @@
     defaults: g-i-installation
     name: '{name}_debian_{my_ver}_{my_desktop}'
 
+- job-template:
+    defaults: g-i-installation
+    name: '{name}_{my_dist}_{my_ver}_{my_profile}'
+
 - job-template:
     defaults: g-i-installation
     name: '{name}_{my_dist}_{my_ver}_{my_profile}_{my_desktop}'
@@ -112,6 +116,17 @@
 - job-group:
     name: '{name}_{my_dist}_group'
     my_disksize: 25
+    jobs:
+      - '{name}_{my_dist}_{my_ver}_{my_profile}':
+          my_title: '{my_distname} ({my_ver}) {my_profile}{my_title_extra}'
+          my_inst_url: 'http://ftp.skolelinux.org/cd-{my_ver}-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+          my_description: 'Do a fully automated installation of a {my_distname} {my_ver} {my_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/{my_dist}_{my_ver}_{my_profile}_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+          my_trigger: ''
+          my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
+
+- job-group:
+    name: '{name}_{my_dist}_desktop_group'
+    my_disksize: 25
     jobs:
       - '{name}_{my_dist}_{my_ver}_{my_profile}_{my_desktop}':
           my_title: '{my_distname} ({my_ver}) {my_profile}{my_title_extra}'
@@ -128,7 +143,7 @@
     my_trigdesc: ''
     my_title_extra: ''
     jobs:
-      - '{name}_{my_dist}_{my_ver}_{my_profile}_{my_desktop}':
+      - '{name}_{my_dist}_{my_ver}_{my_profile}':
          my_title: '{my_distname} ({my_ver}) {my_profile}{my_title_extra}'
          my_description: 'Do a fully automated installation of a {my_distname} {my_verdesc} {my_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/{my_dist}_{my_ver}_{my_profile}_preseed.cfg">this preseed.cfg</a>) using the {my_ver} image.{my_trigdesc}'
 
@@ -225,7 +240,6 @@
             - debian-edu:
                 my_distname: 'Debian Edu'
           my_ver: wheezy
-          my_desktop: ''
           my_title_extra: ''
           my_profile:
             - minimal:
@@ -240,7 +254,7 @@
             - main-server:
                 my_time: '42 2 16 * *'
                 my_disksize: 30
-      - '{name}_{my_dist}_group':
+      - '{name}_{my_dist}_desktop_group':
           my_dist:
             - debian-edu:
                 my_distname: 'Debian Edu'
-- 
cgit v1.2.3-54-g00ecf