[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [OSSTest PATCH] 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 | 31 ++++++++++++++++++++++++------- sg-run-job | 8 +++++++- ts-debian-hvm-install | 10 ++++++++-- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/make-flight b/make-flight index 92b813a..e21b14f 100755 --- a/make-flight +++ b/make-flight @@ -162,15 +162,32 @@ 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_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 + job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-ovmf-amd64 \ + test-debianhvm-ovmf xl $xenarch $dom0arch $qemuu_runvar \ + ovmf_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 } do_hvm_rhel6_tests () { @@ -285,7 +302,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..42e3863 100755 --- a/sg-run-job +++ b/sg-run-job @@ -265,10 +265,16 @@ proc run-job/test-rhelhvm {} { test-guest-nomigr redhat } +proc need-hosts/test-debianhvm-ovmf {} { return host } +proc run-job/test-debianhvm-ovmf {} { + run-ts . = ts-debian-hvm-install + test-guest ovmf +} + 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..f7ef549 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -28,7 +28,13 @@ if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; } our ($whhost,$gn) = @ARGV; $whhost ||= 'host'; -$gn ||= 'ovmf'; +defined($r{bios}) or die "Need to define which bios to use"; +if ($r{bios} =~ /ovmf/m) { + $gn ||= 'ovmf'; +} else { + # rombios or seabios + $gn ||= 'debianhvm'; +} our $ho= selecthost($whhost); @@ -152,7 +158,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
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |