mfi-*: Set appropriate PropMinVer:XenMin: hostflags, to honour XenMin property

* In test_matrix_iterate, where most_hostflags is set, include a
  PropMinVer:XenMin: hostflag.  This is derived from $xenbranch.
  When $xenbranch is xen-unstable, don't add that hostflag.

* But this is wrong for the migrate upgrade tests, which use both this
  and the previous version of Xen.  It is sufficient to check the
  previous version, so we strip out the existing PropMinVer if there
  is one.  We (ab)use select_prevxenbranch to calculate the old Xen
  branch name (version).

The motivation right now for this is that Xen 4.10 and earlier do not
boot xen.gz on UEFI.  In earlier versions, one has to chainload
xen.efi.  We don't support that in osstest right now on x86 (and it
probably isn't worth fixing that logic).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index 8d1a9b8801d7d6891c160563eac923551738919a..c29a612220b9b5567d0b75b072a0bff9d39d04ee 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -819,6 +819,19 @@ test_matrix_do_one () {
       # x86 only for now
       if [ x$xenarch = xamd64 ] ; then
         local hf=$most_hostflags,equiv-1
+
+        # $most_hostflags will contain a wrong PropMinVer:XenMin:...
+        local propminver_xenmin
+        if [ "x$VERSION_PREVXEN" != x ]; then
+          # VERSION_PREVXEN is "4.8" or "xen-4.8-testing" or "4.8-testing"
+          set_propminver_xenmin "$VERSION_PREVXEN"
+        else
+          local prevxenbranch
+          select_prevxenbranch
+          set_propminver_xenmin "$prevxenbranch"
+        fi
+        hf="$(hostflags_strip "$hf" '^PropMinVer:XenMin:'),$propminver_xenmin"
+
         job_create_test test-$xenarch$kern-$dom0arch-migrupgrade \
                       test-pair-oneway \
                       xl $xenarch $dom0arch \

diff --git a/mfi-common b/mfi-common
index a482463578cd55e0715715c4428548565dc663a0..9b6c94704238dfa1a93acad54cf49ab56f3f6577 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -123,6 +123,13 @@ set_hostos_runvars () {
   esac
 }
 
+set_propminver_xenmin () {
+  propminver_xenmin="$1"
+  propminver_xenmin="${propminver_xenmin#xen-}"
+  propminver_xenmin="${propminver_xenmin%-testing}"
+  propminver_xenmin="PropMinVer:XenMin:$propminver_xenmin"
+}
+
 set_freebsd_runvars () {
     # Caller should have done if required:
     # local freebsd_runvars
@@ -566,6 +573,13 @@ test_matrix_iterate () {
         if [ "x$min_linux_hostflag" != "x" ] ; then
             most_hostflags="$most_hostflags,$min_linux_hostflag"
         fi
+        case "$xenbranch" in
+          xen-[0-9]*-testing)
+            set_propminver_xenmin "$xenbranch"
+            most_hostflags="$most_hostflags,$propminver_xenmin"
+            ;;
+          # other xenbranch values, eg xen-unstable, get no restriction
+        esac
 
         most_runvars="
                   arch=$dom0arch                                  \