two new jobs

3 files changed, 25 insertions, 4 deletions

diff --git a/TODO b/TODO
index 8b039e02..e35b7f15 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,7 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian.
 * try awstats
 * put kgb-client.conf in git and sed passwords from filesystem into it...
 * push jenkins munin plugins upstream
+* rgrep for ftp.de and put this into a config file. and then put other stuff in that config file, like webserver for d-i preseeding. etc.
 
 == Debian Packaging related
 
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index dcf66503..4ce342ac 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -36,7 +36,7 @@ DISKSIZE_IN_GB=$3
 URL=$4
 # $5 and $6 are used below for language setting
 RAMSIZE=1024
-if [ "$(basename $URL)" != "amd64" ] ; then
+if [ "${$URL: -4}" = ".iso" ] ; then
 	IMAGE=$(pwd)/$(basename $URL)
 	IMAGE_MNT="/media/cd-$NAME.iso"
 else
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 13eba7d3..4eaa0706 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -119,6 +119,14 @@
 
 - job-template:
     defaults: g-i-installation
+    name: '{name}_debian_wheezy_gnome'
+
+- job-template:
+    defaults: g-i-installation
+    name: '{name}_debian_squeeze_xfce'
+
+- job-template:
+    defaults: g-i-installation
     name: '{name}_debian_sid_daily-xfce'
 
 - job-template:
@@ -194,21 +202,33 @@
          my_description: 'Do a fully automated installation of Debian LXDE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_wheezy_lxde_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 19 2,9,16,23 * *'
          my_recipients: 'holger@layer-acht.org'
+      - '{name}_debian_wheezy_gnome':
+         my_title: 'Debian (wheezy) GNOME desktop install'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 11 debian_wheezy_gnome 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
+         my_description: 'Do a fully automated installation of Debian GNOME desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_wheezy_gnome_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_timed: '42 19 2,9,16,23 * *'
+         my_recipients: 'holger@layer-acht.org'
+      - '{name}_debian_squeeze_xfce':
+         my_title: 'Debian (squeeze) XFCE desktop install'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 12 debian_squeeze_xfce 10 http://ftp.de.debian.org/debian/dists/squeeze/main/installer-amd64/current/images/netboot/gtk/debian-installer/amd64/'
+         my_description: 'Do a fully automated installation of Debian XFCE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_squeeze_xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_timed: '# debian squeeze jobs are only build on request. squeeze is stable.'
+         my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_sid_daily-xfce':
          my_title: 'Debian (sid daily build CD) XFCE desktop install'
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 11 debian_sid_daily-xfce 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 13 debian_sid_daily-xfce 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 XFCE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily-xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 8 * * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_sid_daily-lxde':
          my_title: 'Debian (sid daily build CD) LXDE desktop install'
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 12 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_shell: '/srv/jenkins/bin/g-i-installation.sh 14 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 LXDE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily-lxde_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 10 * * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_sid_daily-rescue':
          my_title: 'Debian (sid daily build CD) rescue mode'
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 13 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_shell: '/srv/jenkins/bin/g-i-installation.sh 15 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/d-i-preseed-cfgs/debian_sid_daily-rescue_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 6 * * *'
          my_recipients: 'holger@layer-acht.org'