Re: [Xen-devel] [OSSTEST PATCH V2] More Debian HVM testcases

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Thu, Apr 24, 2014 at 04:10:32PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[OSSTEST PATCH V2] More Debian HVM testcases"):
> > ts-debain-hvm-install was written to work as general HVM testcase. It
> > can be tuned to easily use another BIOS other than OVMF.
> > 
> > Modify make-flight and friends to create more Debian HVM 64bit testcases
> > to run with SeaBIOS and ROMBIOS.
> 
> Thanks.
> 
> > +  if [ "x$qemuu_suffix" == "x-qemuu" ]; then
> > +    # QEMU upstream supports ovmf and seabios
> > +    job_create_test 
> > test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-ovmf-amd64 \
> > +      test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
> > +      debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
> > +      bios=ovmf \
> > +      all_hostflags=$most_hostflags,hvm
> > +
> > +    job_create_test 
> > test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-debianhvm-amd64 \
> > +      test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
> > +      debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
> > +      bios=seabios \
> > +      all_hostflags=$most_hostflags,hvm
> > +  else
> > +    # QEMU traditional supports rombios
> > +    job_create_test 
> > test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-debianhvm-amd64 \
> > +      test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
> > +      debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
> > +      bios=rombios \
> > +      all_hostflags=$most_hostflags,hvm
> > +  fi
> 
> There's a lot of repetition here, which I think ought to be abstracted
> away.
> 
> But by and large this looks good.  The changes to ts-debianhvm-install
> and sg-run-job seem fine to me.
> 

How about this one. Some common code is abstracted away to
do_hvm_debian_test_one.

---8<---
From 67ab811dade8f67096ef1083c1361481da372dac Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@xxxxxxxxxx>
Date: Wed, 23 Apr 2014 18:03:28 +0100
Subject: [OSSTEST PATCH V3] More Debian HVM testcases

ts-debain-hvm-install was written to work as general HVM testcase. It
can be tuned to easily use another BIOS other than OVMF.

Modify make-flight and friends to create more Debian HVM 64bit testcases
to run with SeaBIOS and ROMBIOS.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 make-flight           |   33 ++++++++++++++++++++++++++-------
 sg-run-job            |    2 +-
 ts-debian-hvm-install |    6 ++++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/make-flight b/make-flight
index 92b813a..0871198 100755
--- a/make-flight
+++ b/make-flight
@@ -162,15 +162,34 @@ do_hvm_win7_x64_tests () {
             all_hostflags=$most_hostflags,hvm
 }
 
-do_hvm_debian_ovmf_tests() {
-  if [ $xenarch != amd64 -o "x$qemuu_suffix" != "x-qemuu" ]; then
+do_hvm_debian_test_one () {
+  testname=$1
+  bios=$2
+  job_create_test $testname test-debianhvm xl $xenarch $dom0arch $qemuu_runvar 
\
+    debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
+    bios=$bios \
+    all_hostflags=$most_hostflags,hvm
+}
+
+do_hvm_debian_tests() {
+  if [ $xenarch != amd64 ]; then
     return
   fi
 
-  job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-ovmf-amd64 \
-    test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
-    ovmf_image=debian-7.2.0-amd64-CD-1.iso \
-    all_hostflags=$most_hostflags,hvm
+  if [ "x$qemuu_suffix" == "x-qemuu" ]; then
+    # QEMU upstream supports ovmf and seabios
+    do_hvm_debian_test_one 
test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-ovmf-amd64 \
+      ovmf
+
+    do_hvm_debian_test_one 
test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-debianhvm-amd64 \
+      seabios
+  fi
+
+  if [ "x$qemuu_suffix" == "x-qemut" ]; then
+    # QEMU traditional supports rombios
+    do_hvm_debian_test_one 
test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-debianhvm-amd64 \
+      rombios
+  fi
 }
 
 do_hvm_rhel6_tests () {
@@ -285,7 +304,7 @@ test_matrix_do_one () {
     do_hvm_win7_x64_tests
     do_hvm_rhel6_tests
 
-    do_hvm_debian_ovmf_tests
+    do_hvm_debian_tests
 
   done # qemuu_suffix
 
diff --git a/sg-run-job b/sg-run-job
index d336fbd..2657559 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -268,7 +268,7 @@ proc run-job/test-rhelhvm {} {
 proc need-hosts/test-debianhvm {} { return host }
 proc run-job/test-debianhvm {} {
     run-ts . = ts-debian-hvm-install
-    test-guest ovmf
+    test-guest debianhvm
 }
 
 proc need-hosts/test-pair {} { return {src_host dst_host} }
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index c322d6b..b014f8c 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -26,9 +26,11 @@ tsreadconfig();
 our $stage=0;
 if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
 
+defined($r{bios}) or die "Need to define which bios to use";
+
 our ($whhost,$gn) = @ARGV;
 $whhost ||= 'host';
-$gn ||= 'ovmf';
+$gn ||= 'debianhvm';
 
 our $ho= selecthost($whhost);
 
@@ -152,7 +154,7 @@ sub prep () {
 
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
-                          Bios => 'ovmf',
+                          Bios => $r{bios},
                           PostImageHook => sub {
         my $cmds = iso_copy_content_from_image($gho, $newiso);
         $cmds .= prepare_initrd($initrddir,$newiso,$preseed_file_path);
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel