cleanup previous commit a bit and also use the opportunity to cleanup other related stuff

5 files changed, 20 insertions, 19 deletions

diff --git a/TODO b/TODO
index ea2f335c..a583b153 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,7 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian.
 
 == General ToDo
 
-* switch git:// urls to http:// and thus use proxy. increase polling frequency to 2min.
+* keep git+svn urls, and use commit hooks. also better for test setups of this install :)
 * general housekeeping job:
 ** run calamaris, visitors etc
 ** check for stale processes
@@ -45,6 +45,7 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian.
 === d-i_manual*
 
 * svn:trunk/manual/po triggers the full build, should trigger language specific builds.
+* svn:trunk/manual is all thats needed, not whole svn:trunk
 * inform translators (and debian-boot for the package)
 
 === d-i_build*
@@ -80,10 +81,7 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian.
 ** wheezy-preseed.base for normal d-i
 ** scp -r vm:/var/log/ results/log
 ** ssh root@vm shutdown
-** d-i weekly sid: cat /mnt/isolinux/lxde/gtk.cfg
 * try http://www.os-autoinst.org/
-* start client VMs using the profitbricks API: https://www.profitbricks.com/us/media/docs/PB_PublicAPI_EN.pdf (and dhcp)
-** or probably just run kvm...
 * to test (at first) weekly images of amd64 std,kde,lxde+xfce weekly and the first sid-di daily
 ** http://cdimage.debian.org/cdimage/weekly-builds/amd64/jigdo-cd/
 ** http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/20121020-1/amd64/
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh
index 61b61c41..aedfbb94 100755
--- a/bin/cd_tester.sh
+++ b/bin/cd_tester.sh
@@ -3,13 +3,13 @@
 # Copyright 2012 Holger Levsen <holger@layer-acht.org>
 # released under the GPLv=2
 
-# $1 = vnc-display
+# $1 = vnc-display, each job should have a unique one, so jobs can run in parallel
 # $2 = name
 # $3 = wget url/jigdo url
 
 if [ "$1" = "" ] || [ "$2" = "" ] || [ "$3" = "" ] ; then
 	echo "need three params"
-	echo '# $1 = vnc-display'
+	echo '# $1 = vnc-display, each job should have a unique one, so jobs can run in parallel'
 	echo '# $2 = name'
 	echo '# $3 = wget url/jigdo url'
 	exit 1
@@ -86,9 +86,6 @@ bootstrap() {
 		lxde-wheezy)
 				echo "fire up qemu now..."
 				sudo qemu-system-x86_64 -hda $NAME.qcow -boot c -m 1024 -display vnc=localhost:$DISPLAY --kernel $KERNEL --append "auto=true priority=critical desktop=lxde locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 --" --initrd $INITRD &
-				# wheezy: qemu-system-x86_64 -cdrom debian-6.0.6-amd64-businesscard.iso -hda debian.qcow -boot d -m 2048 -display vnc=localhost:1 --kernel /mnt/install.amd/vmlinuz --append "auto=true priority=critical url=http://10.0.2.2/userContent/preseed.cfg vga=788 initrd=/install.amd/initrd.gz" --initrd /mnt/install.amd/initrd.gz
-				# kernel /install.amd/vmlinuz
-				# append desktop=lxde video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet
 				;;
 		*)		echo "unsupported distro."
 				exit 1
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 * * *'
 
diff --git a/userContent/debian-edu-squeeze-test-standalone-preseed.cfg b/userContent/debian-edu-squeeze-test-standalone-preseed.cfg
index deb0ae86..3470c0f4 100644
--- a/userContent/debian-edu-squeeze-test-standalone-preseed.cfg
+++ b/userContent/debian-edu-squeeze-test-standalone-preseed.cfg
@@ -327,7 +327,7 @@ d-i debian-edu-install/confirm boolean true
 # installed, and what software you use. The default is not to report back,
 # but sending reports helps the project determine what software is most
 # popular and include it on CDs.
-d-i debian-edu-install/participate-popcon boolean false
+#popularity-contest popularity-contest/participate boolean false
 
 ### Finishing up the installation
 # During installations from serial console, the regular virtual consoles
@@ -385,6 +385,12 @@ d-i debian-installer/exit/poweroff boolean true
 # edu specific settings
 #
 
+# the popcon question needs special preseeding as the template
+# being shown is the one in debian-edu-install, which is copied from
+# popularity-contest to ensure all questions show up before packages are
+# downloaded.
+d-i debian-edu-install/participate-popcon boolean false
+
 # Tell LTSP to not use the CDROM, but a HTTP mirror
 d-i ltsp-client-builder/use_cdrom boolean false
 d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
diff --git a/userContent/debian-edu-wheezy-preseed.cfg b/userContent/debian-edu-wheezy-workstation-preseed.cfg
index f20561ae..f20561ae 100644
--- a/userContent/debian-edu-wheezy-preseed.cfg
+++ b/userContent/debian-edu-wheezy-workstation-preseed.cfg