[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#695168: Fix preseeding of popcon question for Debian Edu/Wheezy in jenkins.debian.net



[ Holger Levsen ]
> great, thanks for your patch, applied. Plus then I moved this to the back of 
> the preseed file, to the edu specific configurations and added this note:
> 
> +# 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.
> 
> Will schedule a new test shortly.

The test still hang, and a look in the soure indicate that it was
using the wrong preseeding file URL.  Attached is a patch to fix it.

-- 
Happy hacking
Petter Reinholdtsen
>From d67525ac26878ffd695eabf0c3d6d48d175b88d7 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Wed, 5 Dec 2012 06:59:42 +0100
Subject: [PATCH 3/3] Make sure debian_edu_workstation_wheezy build uses correct debconf preseeding file.

---
 bin/cd_tester.sh     |    2 +-
 job-cfg/cd-test.yaml |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh
index aedfbb9..6291d63 100755
--- a/bin/cd_tester.sh
+++ b/bin/cd_tester.sh
@@ -75,7 +75,7 @@ bootstrap() {
 	echo "Doing cd tests for $NAME now."
 	qemu-img create -f qcow $NAME.qcow 20g
 	case $NAME in
-		debian-edu-wheezy)
+		debian-edu-wheezy-workstation)
 				echo "fire up qemu now..."
 				sudo qemu-system-x86_64 -cdrom $IMAGE -hda $NAME.qcow -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz &
 				;;
diff --git a/job-cfg/cd-test.yaml b/job-cfg/cd-test.yaml
index 3c805a3..6ea3a44 100644
--- a/job-cfg/cd-test.yaml
+++ b/job-cfg/cd-test.yaml
@@ -52,8 +52,8 @@
     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_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 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_shell: '/srv/jenkins/bin/cd_tester.sh 1 debian-edu-wheezy-workstation 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-workstation-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'
-- 
1.7.2.5


Reply to: