rename jobs again, to a $1_$2_$3 naming scheme

1 files changed, 20 insertions, 20 deletions

diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 07d06c4e..52570dd8 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -37,51 +37,51 @@
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_wheezy_debian_edu_workstation'
+    name: '{name}_debian-edu_wheezy-test_workstation'
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_squeeze-test_debian_edu_standalone'
+    name: '{name}_debian-edu_squeeze-test_standalone'
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_wheezy_lxde'
+    name: '{name}_debian_wheezy_lxde'
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_sid_daily_lxde'
+    name: '{name}_debian_sid_daily-lxde'
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_sid_daily_rescue'
+    name: '{name}_debian_sid_daily-rescue'
 
 - project:
     name: g-i-installation
     do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git;a=blob;f=job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.'
     jobs:
-      - '{name}_wheezy_debian_edu_workstation':
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 wheezy-debian-edu-workstation 25 http://ftp.skolelinux.org/cd-edu-testing-nolocal-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-         my_description: 'Do a fully automated installation of a Debian Edu Wheezy workstation installation - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/wheezy-debian-edu-workstation-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+      - '{name}_debian-edu_wheezy-test_workstation':
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 debian-edu_wheezy-test_workstation 25 http://ftp.skolelinux.org/cd-edu-testing-nolocal-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+         my_description: 'Do a fully automated installation of a Debian Edu Wheezy workstation installation - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu_wheezy-test_workstation_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 23 * * *'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
-      - '{name}_squeeze-test_debian_edu_standalone':
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 2 squeeze-test-debian-edu-standalone 20 http://ftp.skolelinux.org/cd-squeeze-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-         my_description: 'Do a fully automated installation of a Debian Edu Squeeze (suite: squeeze-test) standalone installation - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/squeeze-test-debian-edu-standalone-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+      - '{name}_debian-edu_squeeze-test_standalone':
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 2 debian-edu_squeeze-test_standalone 20 http://ftp.skolelinux.org/cd-squeeze-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+         my_description: 'Do a fully automated installation of a Debian Edu Squeeze (suite: squeeze-test) standalone installation - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu_squeeze-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 21 * * *'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
-      - '{name}_wheezy_lxde':
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 3 wheezy-lxde 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
-         my_description: 'Do a fully automated installation of Debian installing the LXDE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/wheezy-lxde-preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+      - '{name}_debian_wheezy_lxde':
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 3 debian_wheezy_lxde 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
+         my_description: 'Do a fully automated installation of Debian installing the LXDE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian_wheezy_lxde_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 15 * * *'
          my_recipients: 'holger@layer-acht.org'  # FIXME readd jenkins+debian-boot here and for other jobs - once we made this more stable
-      - '{name}_sid_daily_lxde':
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 4 sid-daily-lxde 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
-         my_description: 'Do a fully automated installation of Debian installing the LXDE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/sid-daily-lxde-preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+      - '{name}_debian_sid_daily-lxde':
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 4 debian_sid_daily-lxde 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
+         my_description: 'Do a fully automated installation of Debian installing the LXDE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian_sid_daily-lxde_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 17 * * *'
          my_recipients: 'holger@layer-acht.org'
-      - '{name}_sid_daily_rescue':
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 5 sid-daily-rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
-         my_description: 'Just go into rescue mode (coming in more languages soon) via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/sid-daily-rescue-preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+      - '{name}_debian_sid_daily-rescue':
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 5 debian_sid_daily-rescue 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
+         my_description: 'Just go into rescue mode (coming in more languages soon) via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian_sid_daily-rescue_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 19 * * *'
          my_recipients: 'holger@layer-acht.org'