From cd06dac3d729711e05750453d332f0ee37fb1eb8 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 5 Dec 2012 00:39:53 +0100
Subject: cleanup previous commit a bit and also use the opportunity to cleanup
 other related stuff

---
 job-cfg/cd-test.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'job-cfg')

diff --git a/job-cfg/cd-test.yaml b/job-cfg/cd-test.yaml
index cdebc076..8ae5ba88 100644
--- a/job-cfg/cd-test.yaml
+++ b/job-cfg/cd-test.yaml
@@ -37,11 +37,11 @@
 
 - job-template:
     defaults: cd-test
-    name: '{name}_debian_edu_wheezy'
+    name: '{name}_debian_edu_workstation_wheezy'
 
 - job-template:
     defaults: cd-test
-    name: '{name}_debian_edu_squeeze_test_standalone'
+    name: '{name}_debian_edu_standalone_squeeze_test
 
 - job-template:
     defaults: cd-test
@@ -51,16 +51,16 @@
     name: cd-test
     do_not_edit: '<br><br>Configured by <a href="http://jenkins.debian.net/userContent/about.html">jenkins-job-builder</a>, do not edit this job through the web UI.'
     jobs:
-      - '{name}_debian_edu_wheezy':
+      - '{name}_debian_edu_workstation_wheezy':
          my_shell: '/srv/jenkins/bin/cd_tester.sh 1 debian-edu-wheezy http://ftp.skolelinux.org/cd-edu-testing-nolocal-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-         my_description: 'Do a fully automated installation of Debian Edu Wheezy standalone - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu-wheezy-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
-         my_timed: '42 23 * * *'
-      - '{name}_debian_edu_squeeze_test_standalone':
-         my_shell: '/srv/jenkins/bin/cd_tester.sh 1 debian-edu-squeeze-test-standalone 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 Debian Edu Squeeze (test) standalone - 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_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-workstation-wheezy-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 23 * * *'
+      - '{name}_debian_edu_standalone_squeeze_test':
+         my_shell: '/srv/jenkins/bin/cd_tester.sh 2 debian-edu-squeeze-test-standalone 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-standalone-squeeze-test-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_timed: '42 3 * * *'
       - '{name}_lxde_wheezy':
-         my_shell: '/srv/jenkins/bin/cd_tester.sh 2 lxde-wheezy http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
+         my_shell: '/srv/jenkins/bin/cd_tester.sh 3 lxde-wheezy 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/lxde-wheezy-preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 17 * * *'
 
-- 
cgit v1.2.3-70-g09d2