push a lot of the variables up to the top-level jobs

1 files changed, 149 insertions, 169 deletions

diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 386b48fb..a5d657ee 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -126,181 +126,27 @@
     my_disksize: 25
     my_dist:
       - wheezy
-    my_de_profile:
-      - minimal:
-          my_time: '23 20 15 * *'
-      - standalone:
-          my_time: '42 20 15 * *'
-      - workstation:
-          my_time: '42 22 16 * *'
-      - combi-server:
-          my_time: '42 0 16 * *'
-          my_disksize: 30
-      - main-server:
-          my_time: '42 2 16 * *'
-          my_disksize: 30
-    jobs:
-      - '{name}_debian-edu_{my_dist}_{my_de_profile}':
-          my_title: 'Debian Edu ({my_dist}) {my_de_profile}'
-          my_shell: '/srv/jenkins/bin/g-i-installation.sh {my_disksize} http://ftp.skolelinux.org/cd-{my_dist}-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-          my_description: 'Do a fully automated installation of a Debian Edu {my_dist} {my_de_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_{my_dist}_{my_de_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}_debian-edu_desktops_group'
-    my_disksize: 25
-    my_dist: wheezy
-    my_de_profile: standalone
-    my_desktop:
-      - gnome:
-          my_time: '42 18 17 * *'
-      - lxde:
-          my_time: '42 22 17 * *'
-      - xfce:
-          my_time: '42 2 * * 1'
     jobs:
       - '{name}_debian-edu_{my_dist}_{my_de_profile}_{my_desktop}':
-          my_title: 'Debian Edu ({my_dist}) {my_de_profile} ({my_desktop})'
+          my_title: 'Debian Edu ({my_dist}) {my_de_profile}{my_dtdesc}'
           my_shell: '/srv/jenkins/bin/g-i-installation.sh {my_disksize} http://ftp.skolelinux.org/cd-{my_dist}-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
           my_description: 'Do a fully automated installation of a Debian Edu {my_dist} {my_de_profile} profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_{my_dist}_{my_de_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}_debian_wheezy_desktops_group'
-    my_optdesc: ''
-    my_instdesc: ' using netboot gtk'
-    my_dist:
-      - wheezy:
-          my_inst_url: 'http://ftp.de.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/gtk/debian-installer/amd64/'
-    my_desktop:
-      - kde:
-          my_time: '42 15 2,9,16,23 * *'
-          my_preseed: 'kde'
-      - xfce:
-          my_time: '42 16 4 * *'
-          my_preseed: 'xfce'
-      - lxde:
-          my_time: '42 19 4 * *'
-          my_preseed: 'lxde'
-      - gnome:
-          my_time: '42 19 4 * *'
-          my_preseed: 'gnome'
-      - kfreebsd_xfce:
-          my_time: '42 16 21 * *'
-          my_inst_url: 'http://ftp.de.debian.org/debian/dists/wheezy/main/installer-kfreebsd-amd64/current/images/netboot-9/gtk/netboot.tar.gz'
-          my_preseed: 'kfreebsd'
-          my_instdesc: 'using PXE netboot gtk'
-    jobs:
-      - '{name}_debian_{my_dist}_{my_desktop}':
-          my_title: 'Debian ({my_dist}) {my_desktop} desktop install{my_optdesc}'
-          my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_dist}_{my_preseed}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.'
-          my_trigger: ''
-          my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 {my_inst_url}'
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
-
-- job-group:
-    name: '{name}_debian_sid_daily_desktops_group'
+    name: '{name}_debian_{my_dist}_desktops_group'
     my_optdesc: ''
     my_trigger: ''
     my_time: ''
     my_trigdesc: ''
-    my_instdesc: ' using netboot gtk'
-    my_inst_url: http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso
-    my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
-    my_dist:
-      - sid_daily
-    my_desktop:
-      - gnome:
-          my_time: '42 8 * * *'
-          my_preseed: gnome
-          my_trigger: 'g-i-installation_debian_sid_gnome_brltty, g-i-installation_debian_sid_gnome_speakup'
-      - gnome_brltty:
-          my_preseed: 'gnome_brltty'
-          my_optdesc: ' with braille display support'
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
-      - gnome_speakup:
-          my_preseed: 'gnome_speakup'
-          my_optdesc: ' with Speakup support'
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
-      - xfce:
-          my_preseed: 'xfce'
-          my_time: '42 8 * * *'
-      - kfreebsd_xfce:
-          my_preseed: 'kfreebsd'
-          my_inst_url: 'http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-10/gtk/netboot.tar.gz'
-          my_time: '42 8 */7 * *'
-          my_instdesc: 'using PXE netboot gtk'
-      - lxde:
-          my_preseed: 'lxde'
-          my_time: '42 10 * * *'
-      - hurd_lxde:
-          my_preseed: hurd_lxde
-          my_inst_url: 'http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/daily/debian-sid-hurd-i386-NETINST-1.iso'
-          my_instdesc: ''
-          my_trigdesc: '<br />This job is only triggered manually.'
-          my_optdesc2: ' on <a href="https://lists.debian.org/debian-devel-announce/2015/04/msg00012.html">Debian GNU/hurd 2015 Jessie release</a>'
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-hurd@lists.debian.org'
-
-    jobs:
-      - '{name}_debian_{my_dist}_{my_desktop}':
-          my_title: 'Debian ({my_dist} build CD) {my_desktop} desktop install{my_optdesc}'
-          my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_dist}_{my_preseed}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.{my_trigdesc}'
-          my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 {my_inst_url}'
-
-
-- job-group:
-    name: '{name}_debian_jessie_desktops_group'
-    my_trigger: ''
-    my_optdesc: ''
     my_optdesc2: ''
-    my_instdesc: ' using netboot gtk'
-    my_dist:
-      - jessie:
-          my_inst_url: 'http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
-    my_desktop:
-      - kde:
-          my_preseed: kde
-          my_time: '42 15 */2 * *'
-      - xfce:
-          my_preseed: xfce
-          my_time: '42 16 */2 * *'
-      - lxde:
-          my_preseed: lxde
-          my_time: '42 19 */2 * *'
-      - gnome:
-          my_preseed: gnome
-          my_time: '42 19 */2 * *'
-          my_trigger: 'g-i-installation_debian_{my_dist}_gnome_brltty, g-i-installation_debian_{my_dist}_gnome_speakup'
-      - gnome_brltty:
-          my_preseed: gnome_brltty
-          my_optdesc: ' with braille display support'
-          my_time: ''
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
-      - gnome_speakup:
-          my_preseed: gnome_speakup
-          my_optdesc: ' with Speakup support'
-          my_time: ''
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
-      - kfreebsd_xfce:
-          my_preseed: kfreebsd # FIXME: if this was 'kfreebsd_xfce' we could do without my_preseed
-          my_inst_url: 'http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-10/gtk/netboot.tar.gz'
-          my_time: '42 16 */7 * *'
-          my_instdesc: ' using PXE netboot gtk'
-      - hurd_lxde:
-          my_preseed: hurd_lxde
-          my_inst_url: 'http://ftp.debian-ports.org/debian-cd/hurd-i386/debian-hurd-2015/debian-hurd-2015-i386-NETINST-1.iso'
-          my_instdesc: ''
-          my_time: '42 10 */2 * *'
-          my_optdesc2: ' on <a href="https://lists.debian.org/debian-devel-announce/2015/04/msg00012.html">Debian GNU/hurd 2015 Jessie release</a>'
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-hurd@lists.debian.org'
+    my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
     jobs:
       - '{name}_debian_{my_dist}_{my_desktop}':
-          my_title: 'Debian ({my_dist}) {my_desktop} desktop install{my_optdesc}'
-          my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc}{my_optdesc2} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_dist}_{my_preseed}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.'
+          my_title: 'Debian ({my_mediadesc}) {my_desktop} desktop install{my_optdesc}'
+          my_description: 'Do a fully automated installation of Debian {my_desktop} desktop{my_optdesc}{my_optdesc2} - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_dist}_{my_preseed}_preseed.cfg">this preseed.cfg</a>){my_instdesc}.{my_trigdesc}'
           my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 {my_inst_url}'
-          my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
 
 
 - job-group:
@@ -437,37 +283,171 @@
     do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.'
     jobs:
       - '{name}_maintenance'
-      - '{name}_debian-edu_group'
-      - '{name}_debian-edu_desktops_group'
-      - '{name}_debian_wheezy_desktops_group'
-      - '{name}_debian_jessie_desktops_group'
+      - '{name}_debian-edu_group':
+          my_desktop: ''
+          my_dtdesc: ''
+          my_de_profile:
+            - minimal:
+                my_time: '23 20 15 * *'
+            - standalone:
+                my_time: '42 20 15 * *'
+            - workstation:
+                my_time: '42 22 16 * *'
+            - combi-server:
+                my_time: '42 0 16 * *'
+                my_disksize: 30
+            - main-server:
+                my_time: '42 2 16 * *'
+                my_disksize: 30
+      - '{name}_debian-edu_group':
+          my_de_profile: standalone
+          my_desktop:
+            - _gnome:
+                my_dtdesc: ' (gnome)'
+                my_time: '42 18 17 * *'
+            - _lxde:
+                my_dtdesc: ' (lxde)'
+                my_time: '42 22 17 * *'
+            - _xfce:
+                my_dtdesc: ' (xfce)'
+                my_time: '42 2 * * 1'
+
+      - '{name}_debian_{my_dist}_desktops_group':
+          my_dist: wheezy
+          my_mediadesc: wheezy
+          my_instdesc: ' using netboot gtk'
+          my_inst_url: 'http://ftp.de.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/gtk/debian-installer/amd64/'
+          my_desktop:
+            - kde:
+                my_time: '42 15 2,9,16,23 * *'
+                my_preseed: 'kde'
+            - xfce:
+                my_time: '42 16 4 * *'
+                my_preseed: 'xfce'
+            - lxde:
+                my_time: '42 19 4 * *'
+                my_preseed: 'lxde'
+            - gnome:
+                my_time: '42 19 4 * *'
+                my_preseed: 'gnome'
+
+      - '{name}_debian_{my_dist}_desktops_group':
+          my_dist: jessie
+          my_mediadesc: jessie
+          my_inst_url: 'http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
+          my_instdesc: ' using netboot gtk'
+          my_desktop:
+            - kde:
+                my_preseed: kde
+                my_time: '42 15 */2 * *'
+            - xfce:
+                my_preseed: xfce
+                my_time: '42 16 */2 * *'
+            - lxde:
+                my_preseed: lxde
+                my_time: '42 19 */2 * *'
+            - gnome:
+                my_preseed: gnome
+                my_time: '42 19 */2 * *'
+                my_trigger: 'g-i-installation_debian_{my_dist}_gnome_brltty, g-i-installation_debian_{my_dist}_gnome_speakup'
+            - gnome_brltty:
+                my_preseed: gnome_brltty
+                my_optdesc: ' with braille display support'
+                my_time: ''
+                my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
+            - gnome_speakup:
+                my_preseed: gnome_speakup
+                my_optdesc: ' with Speakup support'
+                my_time: ''
+                my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
+
+      - '{name}_debian_{my_dist}_desktops_group':
+          my_dist: sid_daily
+          my_inst_url: 'http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
+          my_mediadesc: 'sid daily build CD'
+          my_instdesc: ' using netboot gtk'
+          my_desktop:
+            - gnome:
+                my_time: '42 8 * * *'
+                my_preseed: gnome
+                my_trigger: 'g-i-installation_debian_sid_gnome_brltty, g-i-installation_debian_sid_gnome_speakup'
+            - gnome_brltty:
+                my_preseed: 'gnome_brltty'
+                my_optdesc: ' with braille display support'
+                my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
+            - gnome_speakup:
+                my_preseed: 'gnome_speakup'
+                my_optdesc: ' with Speakup support'
+                my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-accessibility@lists.debian.org'
+            - xfce:
+                my_preseed: 'xfce'
+                my_time: '42 8 * * *'
+            - kfreebsd_xfce:
+                my_preseed: 'kfreebsd'
+                my_inst_url: 'http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-10/gtk/netboot.tar.gz'
+                my_time: '42 8 */7 * *'
+                my_instdesc: 'using PXE netboot gtk'
+            - lxde:
+                my_preseed: 'lxde'
+                my_time: '42 10 * * *'
+
+      - '{name}_debian_{my_dist}_desktops_group':
+          my_desktop: kfreebsd_xfce
+          my_preseed: kfreebsd # FIXME: if this was 'kfreebsd_xfce' we could do without my_preseed
+          my_instdesc: ' using PXE netboot gtk'
+          my_dist:
+            - wheezy:
+                my_mediadesc: wheezy
+                my_time: '42 16 21 * *'
+                my_inst_url: 'http://ftp.de.debian.org/debian/dists/wheezy/main/installer-kfreebsd-amd64/current/images/netboot-9/gtk/netboot.tar.gz'
+            - jessie:
+                my_mediadesc: jessie
+                my_inst_url: 'http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-10/gtk/netboot.tar.gz'
+                my_time: '42 16 */7 * *'
+
+      - '{name}_debian_{my_dist}_desktops_group':
+          my_desktop:
+            - hurd_lxde:
+                # for some reason, putting these variables below 'my_desktop' makes them work
+                my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org debian-hurd@lists.debian.org'
+                my_preseed: hurd_lxde
+                my_instdesc: ''
+          my_dist:
+            - jessie:
+                my_inst_url: 'http://ftp.debian-ports.org/debian-cd/hurd-i386/debian-hurd-2015/debian-hurd-2015-i386-NETINST-1.iso'
+                my_time: '42 10 */2 * *'
+                my_mediadesc: jessie
+                my_optdesc2: ' on <a href="https://lists.debian.org/debian-devel-announce/2015/04/msg00012.html">Debian GNU/hurd 2015 Jessie release</a>'
+            - sid_daily:
+                my_inst_url: 'http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/daily/debian-sid-hurd-i386-NETINST-1.iso'
+                my_trigdesc: '<br />This job is only triggered manually.'
+                my_mediadesc: 'sid daily build CD'
+
       - '{name}_debian_sid_daily_rescue_translations_group'
       - '{name}_debian-edu_jessie-beta1-netinst_group'
       - '{name}_debian-edu_jessie-daily_group'
-      - '{name}_debian_sid_daily_desktops_group'
 
 
       - '{name}_debian_{my_dist}_presentation':
           my_dist:
             - wheezy:
-                my_instdesc: 'netboot'
+                my_mediadesc: 'wheezy netboot'
                 my_inst_url: 'http://ftp.de.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/debian-installer/amd64/'
                 my_time: '44 15 23 * *'
             - jessie:
-                my_instdesc: 'netboot'
+                my_mediadesc: 'jessie netboot'
                 my_inst_url: 'http://d-i.debian.org/daily-images/amd64/daily/netboot/debian-installer/amd64/'
                 my_time: '43 15 23 * *'
             - sid_daily:
-                my_instdesc: 'build CD'
+                my_mediadesc: 'sid daily build CD'
                 my_inst_url: 'http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
                 my_time: '42 15 23 * *'
-          my_title: 'Debian-Installer ({my_dist} {my_instdesc}) used for presentations'
+          my_title: 'Debian-Installer ({my_mediadesc}) used for presentations'
           my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 {my_inst_url}'
           my_description: 'Use d-i for presentations via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_{my_dist}_presentation_preseed.cfg">this preseed.cfg</a>).'
           my_trigger: ''
           my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
 
-
       - '{name}_debian_sid_daily_rescue{my_theme}':
           my_theme:
             - '':