ts-debian-hvm-install: Use /dev/sda for i386, not /dev/xvda

The device shows up as /dev/sda in the installer.  This is because the
i386 installer image (in wheezy and jessie, at least) is not PAE, and
therefore does not load PVHVM drivers and therefore does not switch
from the emulated device (which shows up as /dev/sda) to blockfront
(/dev/xvda).

There are ways it might be possible to provide an i386 install image
with PVHVM drivers (for example, the Xen-enabled i386 kernel on the
multi-arch ISO).  However it is useful to have a test job which tests
both emulated devices and PVHVM ones, within a single job, and even on
my ancient under-desk test box (bedbug) the whole test takes only 28
minutes, which seems fine even as part of the fast smoke test.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/make-flight b/make-flight
index accf92223deac9345efa91d918777b2db9f153d3..2552a53b93bfdb3cbbce26dbd3d72208e25b6c30 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -263,10 +263,12 @@ do_hvm_debian_test_one () {
   stubdom=$5 # '' (or unset) or 'true'
 
   local arch=$(branch_debianhvm_arch)
+  local testvars
 
   case "$arch" in
     amd64) iso_dir='install.amd' ;;
-    i386)  iso_dir='install.386' ;;
+    i386)  iso_dir='install.386'
+           testvars+=' debianhvm_diskdevice=/dev/sda' ;;
     *)     iso_dir="install.$arch" ;;
   esac
 
@@ -280,7 +282,7 @@ do_hvm_debian_test_one () {
   job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-$arch\
     test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
     enable_xsm=$xsm                             \
-    $stubdom_runvar                             \
+    $stubdom_runvar $testvars                   \
     debianhvm_image=debian-7.2.0-$arch-CD-1.iso \
     debianhvm_iso_kernel=/$iso_dir/vmlinuz \
     debianhvm_iso_ramdisk=/$iso_dir/initrd.gz \

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 6646a5ac13ddc70cd888b7e42a9868739afafa8b..0f3996a238021943da3a9dc9565c39c2fb63fab8 100755 (executable)
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -57,10 +57,12 @@ sub preseed () {
 
     my $preseed_file = preseed_base($gho,$gsuite,'','',());
 
+    my $disk = guest_var($gho,'diskdevice','/dev/xvda');
+
     $preseed_file .= (<<END.($bootfile =~ m/\befi\b/ ? <<END : '').<<END);
 d-i netcfg/get_hostname string $gn
 
-d-i partman-auto/disk string /dev/xvda
+d-i partman-auto/disk string $disk
 d-i partman-auto/method string  regular
 
 d-i partman-auto/expert_recipe string \\