|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v3 11/11] mfi-common, make-flight: create XSM test jobs
Duplicate Debian PV and HVM test jobs for XSM testing.
Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
make-flight | 61 +++++++++++++++++++++++++++++++++++++++--------------------
mfi-common | 11 +++++++++--
2 files changed, 49 insertions(+), 23 deletions(-)
diff --git a/make-flight b/make-flight
index 9963a46..9ab95a0 100755
--- a/make-flight
+++ b/make-flight
@@ -123,7 +123,7 @@ do_rumpkernel_tests () {
rumparch=$dom0arch
job_create_test test-$xenarch$kern-$dom0arch-rumpuserxen-$rumparch \
test-rumpuserxen xl \
- $xenarch $dom0arch \
+ $xenarch $dom0arch n \
guests_rumpuserxenbuildjob=build-$rumparch-rumpuserxen \
rump_builtimage=rumpuserxen:/usr/local/lib/xen/rump-kernel/rump-kernel \
rump_cmdline=3 \
@@ -141,7 +141,7 @@ do_freebsd_tests () {
for freebsdarch in amd64 i386; do
job_create_test
test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd10-$freebsdarch \
- test-freebsd xl $xenarch $dom0arch \
+ test-freebsd xl $xenarch $dom0arch n \
freebsd_arch=$freebsdarch \
freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.0-RELEASE-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20140116-r260789.qcow2.xz}
\
all_hostflags=$most_hostflags
@@ -179,7 +179,7 @@ do_hvm_winxp_tests () {
job_create_test \
test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix-winxpsp3$vcpus_suffix \
- test-win $toolstack $xenarch $dom0arch $qemuu_runvar \
+ test-win $toolstack $xenarch $dom0arch n $qemuu_runvar \
win_image=winxpsp3.iso $vcpus_runvars \
all_hostflags=$most_hostflags,hvm
@@ -192,7 +192,7 @@ do_hvm_win7_x64_tests () {
fi
job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-win7-amd64 \
- test-win xl $xenarch $dom0arch $qemuu_runvar \
+ test-win xl $xenarch $dom0arch n $qemuu_runvar \
win_image=win7-x64.iso \
all_hostflags=$most_hostflags,hvm
}
@@ -200,27 +200,36 @@ do_hvm_win7_x64_tests () {
do_hvm_debian_test_one () {
testname=$1
bios=$2
+ xsm=$3
+
job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64\
- test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+ test-debianhvm xl $xenarch $dom0arch $xsm $qemuu_runvar \
+ enable_xsm=$xsm \
debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
bios=$bios \
all_hostflags=$most_hostflags,hvm
}
do_hvm_debian_tests() {
+ test_xsm="$@"
+
if [ $xenarch != amd64 ]; then
return
fi
# QEMU upstream supports ovmf and seabios
if [ "x$qemuu_suffix" == "x-qemuu" ]; then
- do_hvm_debian_test_one ovmf ovmf
- do_hvm_debian_test_one debianhvm seabios
+ do_hvm_debian_test_one ovmf ovmf n
+ for xsm in $test_xsm ; do
+ do_hvm_debian_test_one debianhvm seabios $xsm
+ done
fi
# QEMU traditional supports rombios
if [ "x$qemuu_suffix" == "x-qemut" ]; then
- do_hvm_debian_test_one debianhvm rombios
+ for xsm in $test_xsm ; do
+ do_hvm_debian_test_one debianhvm rombios $xsm
+ done
fi
}
@@ -232,7 +241,7 @@ do_hvm_rhel6_tests () {
for cpuvendor in amd intel; do
job_create_test
test-$xenarch$kern-$dom0arch$qemuu_suffix-rhel6hvm-$cpuvendor \
- test-rhelhvm xl $xenarch $dom0arch
\
+ test-rhelhvm xl $xenarch $dom0arch
n \
redhat_image=rhel-server-6.1-i386-dvd.iso \
all_hostflags=$most_hostflags,hvm-$cpuvendor \
$qemuu_runvar
@@ -247,7 +256,7 @@ do_sedf_tests () {
for pin in '' -pin; do
job_create_test test-$xenarch$kern-$dom0arch-xl-sedf$pin \
- test-debian xl $xenarch $dom0arch \
+ test-debian xl $xenarch $dom0arch n \
guests_vcpus=4 \
xen_boot_append="sched=sedf loglvl=all ${pin:+dom0_vcpus_pin}" \
linux_boot_append='loglevel=9 debug' \
@@ -261,7 +270,7 @@ do_credit2_tests () {
fi
job_create_test test-$xenarch$kern-$dom0arch-xl-credit2 \
- test-debian xl $xenarch $dom0arch \
+ test-debian xl $xenarch $dom0arch n \
guests_vcpus=4 xen_boot_append='sched=credit2' \
$debian_runvars all_hostflags=$most_hostflags
}
@@ -273,7 +282,7 @@ do_passthrough_tests () {
for cpuvendor in intel; do
job_create_test test-$xenarch$kern-$dom0arch-xl-pcipt-intel \
- test-debian-nomigr xl $xenarch $dom0arch \
+ test-debian-nomigr xl $xenarch $dom0arch n \
guests_vcpus=4 \
$debian_runvars debian_pcipassthrough_nic=host \
all_hostflags=$most_hostflags,hvm-$cpuvendor,pcipassthrough-nic
@@ -281,16 +290,26 @@ do_passthrough_tests () {
done
}
-test_matrix_do_one () {
-
- # Basic PV Linux test with xl
+do_pv_linux_xl_test_one () {
+ xsm=$1
job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \
- $xenarch $dom0arch \
+ $xenarch $dom0arch $xsm \
+ enable_xsm=$xsm \
$debian_runvars all_hostflags=$most_hostflags
+}
+
+test_matrix_do_one () {
+
+ test_xsm=$(xenbranch_wants_xsm_tests)
+
+ # Basic PV Linux test with xl
+ for xsm in $test_xsm ; do
+ do_pv_linux_xl_test_one $xsm
+ done
job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \
- $xenarch $dom0arch \
+ $xenarch $dom0arch n \
$debian_runvars all_hostflags=$most_hostflags
# No further arm tests at the moment
@@ -314,7 +333,7 @@ test_matrix_do_one () {
# xend PV guest test on x86 only
if [ x$test_xend = xy -a \( $dom0arch = "i386" -o $dom0arch = "amd64" \) ];
then
job_create_test test-$xenarch$kern-$dom0arch-pv test-debian xend \
- $xenarch $dom0arch \
+ $xenarch $dom0arch n \
$debian_runvars all_hostflags=$most_hostflags
fi
@@ -342,13 +361,13 @@ test_matrix_do_one () {
do_hvm_win7_x64_tests
do_hvm_rhel6_tests
- do_hvm_debian_tests
+ do_hvm_debian_tests $test_xsm
done # qemuu_suffix
# Test live migration
job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
- $onetoolstack $xenarch $dom0arch \
+ $onetoolstack $xenarch $dom0arch n \
!host !host_hostflags \
$debian_runvars \
all_hostflags=$most_hostflags,equiv-1
@@ -359,7 +378,7 @@ test_matrix_do_one () {
if [ $xenarch = amd64 -a $dom0arch = i386 ]; then
job_create_test test-$xenarch$kern-$dom0arch-xl-multivcpu \
- test-debian xl $xenarch $dom0arch guests_vcpus=4 \
+ test-debian xl $xenarch $dom0arch n guests_vcpus=4 \
$debian_runvars all_hostflags=$most_hostflags
fi
diff --git a/mfi-common b/mfi-common
index e772086..a81dfba 100644
--- a/mfi-common
+++ b/mfi-common
@@ -267,9 +267,16 @@ job_create_test () {
local toolstack=$1; shift
local xenarch=$1; shift
local dom0arch=$1; shift
+ local xsm=$1; shift
- xenbuildjob="${bfi}build-$xenarch"
- buildjob="${bfi}build-$dom0arch"
+ xsm_suffix=""
+ if [ x$xsm = xy ] ; then
+ xsm_suffix="-xsm"
+ fi
+
+ job="$job$xsm_suffix"
+ xenbuildjob="${bfi}build-$xenarch$xsm_suffix"
+ buildjob="${bfi}build-$dom0arch$xsm_suffix"
tsbuildjob=
case "$xenbranch:$toolstack" in
--
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 |