cr-daily-branch: ovmf: "usually" use xen-tested-master

This branch is supposed to be suitable for all versions of Xen.
Conversely, older versions of OVMF do not build on newer compilers (as
provided, eg, in stretch).

So, for "branches" other than xen-unstable and xen-unstable-smoke, use
the usual "determine_version" machinery, which will select
xen-tested-master for branches other than the ovmf branch itself.

No change for the ovmf "branch", nor for xen-unstable*.  The effect is
to switch xen-*-testing, qemu-*, linux-*, etc., to all use ovmf
xen-tested-master.

Verified with standalone-generate-dump-flight-runvars.  In detail:
In these flights:
   examine freebsd-master libvirt linux-*
   osstest qemu-* seabios xen-4.* xtf
in these jobs
   build-amd64
   build-arm64
   build-armhf
   build-i386
change
   revision_ovmf  to   the output of   ./ap-fetch-version-baseline ovmf
   tree_ovmf      to   git://xenbits.xen.org/osstest/ovmf.git
(each being previously set to the empty string).

Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/cr-daily-branch b/cr-daily-branch
index 5698b08300f0afc0dc464ede48f0d86d23842256..00b713b3220291eec1b7253fbcd15cc3df560f81 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -204,14 +204,17 @@ if [ "x$REVISION_SEABIOS" = x ]; then
     fi
 fi
 if [ "x$REVISION_OVMF" = x ]; then
-    if [ "x$tree" = "xovmf" ]; then
+    case "$branch" in
+    xen-unstable*)
+       : REVISION_OVMF from Config.mk
+       ;;
+    *)
        TREE_OVMF=$TREE_OVMF_UPSTREAM
        export TREE_OVMF
        determine_version REVISION_OVMF ovmf OVMF
        export REVISION_OVMF
-    else
-       : REVISION_OVMF from Config.mk
-    fi
+       ;;
+    esac
 fi
 if [ "x$REVISION_LIBVIRT" = x ]; then
        case "$xenbranch" in