From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [OSSTEST PATCH V2] More Debian HVM testcases
Date: Thu, 24 Apr 2014 15:58:26 +0100 [thread overview]
Message-ID: <1398351506-15076-1-git-send-email-wei.liu2@citrix.com> (raw)
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@citrix.com>
---
v2: always use "debianhvm" as guest name to simplify things.
---
make-flight | 31 ++++++++++++++++++++++++-------
sg-run-job | 2 +-
ts-debian-hvm-install | 6 ++++--
3 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/make-flight b/make-flight
index 92b813a..5e9eade 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 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
}
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..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
next reply other threads:[~2014-04-24 14:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 14:58 Wei Liu [this message]
2014-04-24 15:10 ` [OSSTEST PATCH V2] More Debian HVM testcases Ian Jackson
2014-04-24 15:31 ` Wei Liu
2014-04-24 15:47 ` Wei Liu
2014-04-30 14:51 ` Ian Jackson
2014-05-12 15:44 ` Ian Jackson
2014-04-24 16:07 ` Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398351506-15076-1-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.