mfi-common: Do not enable ovmf for xen-4.4-testing build-*-prev jobs

That is, jobs which are building xen-4.3-testing, where ovmf was not
yet supported.

Full diff to standalone-generate-dump-flight-runvars is:

$ diff -u BEFORE AFTER
--- BEFORE	2015-10-08 10:30:04.860534748 +0100
+++ AFTER	2015-10-08 11:21:21.618731064 +0100
@@ -17283,11 +17283,11 @@
 xen-4.4-testing            test-amd64-i386-xl-qemuu-win7-amd64       device_model_version         qemu-xen
 xen-4.4-testing            test-amd64-i386-xl-qemuu-winxpsp3-vcpus1  device_model_version         qemu-xen
 xen-4.4-testing            build-amd64                               enable_ovmf                  true
-xen-4.4-testing            build-amd64-prev                          enable_ovmf                  true
+xen-4.4-testing            build-amd64-prev                          enable_ovmf                  false
 xen-4.4-testing            build-amd64-xend                          enable_ovmf                  true
 xen-4.4-testing            build-armhf                               enable_ovmf                  true
 xen-4.4-testing            build-i386                                enable_ovmf                  true
-xen-4.4-testing            build-i386-prev                           enable_ovmf                  true
+xen-4.4-testing            build-i386-prev                           enable_ovmf                  false
 xen-4.4-testing            build-i386-xend                           enable_ovmf                  true
 xen-4.4-testing            build-amd64                               enable_xend                  false
 xen-4.4-testing            build-amd64-prev                          enable_xend                  false

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/mfi-common b/mfi-common
index 5456c2c7e231465a27020b50a6f3fc39c040b2c2..fab4aa37bc9dc41a698dd27cc4abe4045db515f8 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -167,8 +167,10 @@ create_build_jobs () {
     xen-4.1-testing) enable_ovmf=false;;
     xen-4.2-testing) enable_ovmf=false;;
     xen-4.3-testing) enable_ovmf=false;;
+    xen-4.4-testing) enable_ovmf=true; enable_prevovmf=false;;
     *) enable_ovmf=true;
     esac
+    enable_prevovmf=${enable_prevovmf:-$enable_ovmf}
 
     want_prevxen=n
     if branch_wants_migrupgrade_tests ; then
@@ -217,7 +219,7 @@ create_build_jobs () {
         # pickup the versions implicitly selected by the
         # $REVISION_PREVXEN.
         job_create_build build-$arch-prev build                       \
-                    arch=$arch enable_xend=false enable_ovmf=$enable_ovmf    \
+                    arch=$arch enable_xend=false enable_ovmf=$enable_prevovmf\
                     enable_xsm=false                                         \
             tree_xen=$TREE_XEN                                               \
                     $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \