[OSSTEST] make-flight: add dom0 PVH test

Commit Message

Roger Pau Monne March 5, 2020, 4 p.m. UTC

Add a dom0 PVH test, the test to be run is launching a PV guest
(test-debian). Note the PVH dom0 tests are only enabled for Xen >=
4.13.

The runvar difference is:

+test-amd64-amd64-dom0pvh-xl-amd   all_host_di_version 2020-02-10
+test-amd64-amd64-dom0pvh-xl-intel all_host_di_version 2020-02-10
+test-amd64-amd64-dom0pvh-xl-amd   all_host_suite      stretch
+test-amd64-amd64-dom0pvh-xl-intel all_host_suite      stretch
+test-amd64-amd64-dom0pvh-xl-amd   all_hostflags       arch-amd64,arch-xen-amd64,suite-stretch,purpose-test,hvm-amd
+test-amd64-amd64-dom0pvh-xl-intel all_hostflags       arch-amd64,arch-xen-amd64,suite-stretch,purpose-test,hvm-intel
+test-amd64-amd64-dom0pvh-xl-amd   arch                amd64
+test-amd64-amd64-dom0pvh-xl-intel arch                amd64
+test-amd64-amd64-dom0pvh-xl-amd   buildjob            build-amd64
+test-amd64-amd64-dom0pvh-xl-intel buildjob            build-amd64
+test-amd64-amd64-dom0pvh-xl-amd   debian_arch         amd64
+test-amd64-amd64-dom0pvh-xl-intel debian_arch         amd64
+test-amd64-amd64-dom0pvh-xl-amd   debian_kernkind     pvops
+test-amd64-amd64-dom0pvh-xl-intel debian_kernkind     pvops
+test-amd64-amd64-dom0pvh-xl-amd   debian_suite        stretch
+test-amd64-amd64-dom0pvh-xl-intel debian_suite        stretch
+test-amd64-amd64-dom0pvh-xl-amd   kernbuildjob        build-amd64-pvops
+test-amd64-amd64-dom0pvh-xl-intel kernbuildjob        build-amd64-pvops
+test-amd64-amd64-dom0pvh-xl-amd   kernkind            pvops
+test-amd64-amd64-dom0pvh-xl-intel kernkind            pvops
+test-amd64-amd64-dom0pvh-xl-amd   toolstack           xl
+test-amd64-amd64-dom0pvh-xl-intel toolstack           xl
+test-amd64-amd64-dom0pvh-xl-amd   xen_boot_append     dom0=pvh,verbose
+test-amd64-amd64-dom0pvh-xl-intel xen_boot_append     dom0=pvh,verbose

Signed-off-by: Roger Pau Monné <[e-mail]>
---
 make-flight | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

Comments

Ian Jackson March 9, 2020, 11:19 a.m. UTC | #1

Roger Pau Monne writes ("[PATCH OSSTEST] make-flight: add dom0 PVH test"):
> Add a dom0 PVH test, the test to be run is launching a PV guest
> (test-debian). Note the PVH dom0 tests are only enabled for Xen >=
> 4.13.

Reviewed-by: Ian Jackson <[e-mail]>

Thanks!

Ian.

Patch

diff --git a/make-flight b/make-flight
index b08431dc..23a853cc 100755
--- a/make-flight
+++ b/make-flight
@@ -753,6 +753,16 @@  test_matrix_do_one () {
   *)                test_shim=y ;;
   esac
 
+  # PVH dom0 tests for versions >= 4.13 only
+  case "$xenbranch" in
+  xen-3.*-testing)  test_dom0pvh=n ;;
+  xen-4.?-testing)  test_dom0pvh=n ;;
+  xen-4.10-testing) test_dom0pvh=n ;;
+  xen-4.11-testing) test_dom0pvh=n ;;
+  xen-4.12-testing) test_dom0pvh=n ;;
+  *)                test_dom0pvh=y ;;
+  esac
+
   # 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 \
@@ -861,6 +871,20 @@  test_matrix_do_one () {
 
   fi
 
+  if [ x$test_dom0pvh = xy -a $xenarch = amd64 -a $dom0arch = amd64 ]; then
+
+    for cpuvendor in amd intel; do
+
+      job_create_test test-$xenarch$kern-$dom0arch-dom0pvh-xl-$cpuvendor \
+                test-debian xl $xenarch $dom0arch $debian_runvars \
+                all_hostflags=$most_hostflags,hvm-$cpuvendor \
+                xen_boot_append='dom0=pvh,verbose'
+
+    done
+
+  fi
+
+
   if [ x$test_shim = xy -a $xenarch = amd64 ]; then
 
     job_create_test test-$xenarch$kern-$dom0arch-xl-pvshim \