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@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
Changes in v8:
1. Make libvirtbuildjob = ${bfi}build-$dom0arch-libvirt

Changes in v6:
1. Skip generating xsm job for different platforms.
2. Use "xsms".
3. Reformat some long lines.

diff --git a/make-flight b/make-flight
index 0cb9b98661d0f137242e69a266514f8481044df6..8ac3a874f8295aaf83d740883365d02b43e330ce 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -207,27 +207,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 \
+    enable_xsm=$xsm                             \
     debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
     bios=$bios \
     all_hostflags=$most_hostflags,hvm
 }
 
 do_hvm_debian_tests() {
+  xsms=$(xenbranch_xsm_variants)
+
   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 false
+    for xsm in $xsms ; 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 $xsms ; do
+      do_hvm_debian_test_one debianhvm rombios $xsm
+    done
   fi
 }
 
@@ -299,19 +308,35 @@ do_passthrough_tests () {
 }
 
 do_pv_debian_tests () {
-  # Basic PV Linux test with xl
-  for platform in '' `getplatforms $xenarch` ; do
-    suffix=${platform:+-$platform}
-    hostflags=${most_hostflags}${platform:+,platform-$platform}
-
-    job_create_test test-$xenarch$kern-$dom0arch-xl$suffix test-debian xl \
-            $xenarch $dom0arch                                   \
-            $debian_runvars all_hostflags=$hostflags
+  xsms=$(xenbranch_xsm_variants)
+
+  for xsm in $xsms ; do
+    # Basic PV Linux test with xl
+    for platform in '' `getplatforms $xenarch` ; do
+
+      # xsm test is not platform specific
+      if [ x$xsm = xtrue -a x$platform != x ]; then
+          continue
+      fi
+
+      suffix=${platform:+-$platform}
+      hostflags=${most_hostflags}${platform:+,platform-$platform}
+
+      job_create_test test-$xenarch$kern-$dom0arch-xl$suffix   \
+                      test-debian xl                           \
+                      $xenarch $dom0arch                       \
+                      enable_xsm=$xsm                          \
+                      $debian_runvars all_hostflags=$hostflags
+    done
   done
 
-  job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \
-            $xenarch $dom0arch                                       \
-            $debian_runvars all_hostflags=$most_hostflags
+  for xsm in $xsms ; do
+    job_create_test test-$xenarch$kern-$dom0arch-libvirt         \
+                    test-debian libvirt                          \
+                    $xenarch $dom0arch                           \
+                    enable_xsm=$xsm                              \
+                    $debian_runvars all_hostflags=$most_hostflags
+  done
 }
 
 test_matrix_do_one () {

diff --git a/mfi-common b/mfi-common
index ee4e6356f55c6807a2aa3ad97f207997ecd4a302..125d50170695a1959f2a7ab9ee8831b0a77e0a28 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -271,15 +271,21 @@ job_create_test () {
   local xenarch=$1; shift
   local dom0arch=$1; shift
 
-  xenbuildjob="${bfi}build-$xenarch"
-  buildjob="${bfi}build-$dom0arch"
+  xsm_suffix=""
+  case " $* " in
+    *" enable_xsm=true "*) xsm_suffix="-xsm";
+  esac
+
+  job="$job$xsm_suffix"
+  xenbuildjob="${bfi}build-$xenarch$xsm_suffix"
+  buildjob="${bfi}build-$dom0arch$xsm_suffix"
   tsbuildjob=
 
   case "$xenbranch:$toolstack" in
     xen-3.*-testing:*) ;;
     xen-4.0-testing:*) ;;
     xen-4.1-testing:*) ;;
-    *:libvirt) tsbuildjob="libvirtbuildjob=$buildjob-libvirt"
+    *:libvirt) tsbuildjob="libvirtbuildjob=${bfi}build-$dom0arch-libvirt"
             ;;
     xen-4.2-testing:*) ;;
     xen-4.3-testing:*) ;;