it's _preseed.cfg now

3 files changed, 14 insertions, 14 deletions

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 71668ff1..eb2612f1 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -84,7 +84,7 @@ cleanup_all() {
 	#
 	# kill qemu and image
 	#
-	sudo kill -9 $(ps fax | grep [q]emu-system | grep ${NAME}-preseed.cfg 2>/dev/null | awk '{print $1}') || true
+	sudo kill -9 $(ps fax | grep [q]emu-system | grep ${NAME}_preseed.cfg 2>/dev/null | awk '{print $1}') || true
 	sleep 0.3s
 	rm $WORKSPACE/$NAME.raw
 	#
@@ -117,7 +117,7 @@ bootstrap() {
 	QEMU_WEBSERVER=http://10.0.2.2/
 	# preseeding related variables
 	PRESEED_PATH=d-i-preseed-cfgs
-	PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}-preseed.cfg"
+	PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_preseed.cfg"
 	INST_LOCALE="locale=en_US"
 	INST_KEYMAP="keymap=us"
 	INST_VIDEO="video=vesa:ywrap,mtrr vga=788"
@@ -139,7 +139,7 @@ bootstrap() {
 			;;
 	esac
 	APPEND="auto=true priority=critical $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $PRESEED_URL $INST_VIDEO -- quiet"
-	show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}-preseed.cfg
+	show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}_preseed.cfg
 	echo
 	echo "Starting QEMU_ now:"
 	(sudo qemu-system-x86_64 \
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index 3ef8db12..d329c049 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -43,7 +43,7 @@
        	ProxyPass /calamaris !
 	ProxyPass /robots.txt http://localhost:8080/userContent/robots.txt
 	# map /d-i-preseed-cfgs to /UserContent/d-i-preseed-cfgs
-	ProxyPass /d-i-preseed-cfgs/ http://localhost:8080//userContent/d-i-preseed-cfgs/
+	ProxyPass /d-i-preseed-cfgs/ http://localhost:8080/userContent/d-i-preseed-cfgs/
 	ProxyPass / http://localhost:8080/
 
 
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 5578c17a..d89f7809 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -81,52 +81,52 @@
     jobs:
       - '{name}_debian-edu_wheezy-test_standalone':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 debian-edu_wheezy-test_standalone 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 standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu_wheezy-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 standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 20 * * 1,3,5,7'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
       - '{name}_debian-edu_wheezy-test_workstation':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 2 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 profile - 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_description: 'Do a fully automated installation of a Debian Edu Wheezy workstation profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_workstation_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 22 * * 1,3,5,7'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
       - '{name}_debian-edu_wheezy-test_combi-server':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 3 debian-edu_wheezy-test_combi-server 50 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 combi-server profile - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu_wheezy-test_combi-server_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Wheezy combi-server profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_combi-server_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 0 * * 1,3,5,7'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
       - '{name}_debian-edu_wheezy-test_sugar':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 4 debian-edu_wheezy-test_sugar 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 sugar profile - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu_wheezy-test_sugar_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Wheezy sugar profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_sugar_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 2 * * 1,3,5,7'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
       - '{name}_debian-edu_squeeze-test_standalone':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 5 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 profile - 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 Squeeze (suite: squeeze-test) standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_squeeze-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 12 1,15 * *'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
       - '{name}_debian-edu_squeeze-test_workstation':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 6 debian-edu_squeeze-test_workstation 50 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) workstation profile - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu_squeeze-test_workstation_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Squeeze (suite: squeeze-test) workstation profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_squeeze-test_workstation_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 14 1,15 * *'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
       - '{name}_debian-edu_squeeze-test_combi-server':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 7 debian-edu_squeeze-test_combi-server 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) combi-server profile - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/debian-edu_squeeze-test_combi-server_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Squeeze (suite: squeeze-test) combi-server profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_squeeze-test_combi-server_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
          my_timed: '42 10 1,15 * *'
          my_recipients: 'jenkins+debian-edu holger@layer-acht.org'
       - '{name}_debian_wheezy_lxde':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 8 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_description: 'Do a fully automated installation of Debian installing the 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 15 2,9,16,23 * *'
          my_recipients: 'holger@layer-acht.org'  # FIXME readd jenkins+debian-boot here and for other jobs - once we made this more stable
       - '{name}_debian_sid_daily-lxde':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 9 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_description: 'Do a fully automated installation of Debian installing the 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 8 * * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_sid_daily-rescue':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 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_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'