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

[Xen-devel] [OSSTEST PATCH] cr-daily-branch: ovmf: "usually" use xen-tested-master

Posted by Ian Jackson 5 years ago

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).

CC: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 cr-daily-branch | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cr-daily-branch b/cr-daily-branch
index 5698b083..00b713b3 100755
--- 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
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [OSSTEST PATCH] cr-daily-branch: ovmf: "usually" use xen-tested-master

Posted by Anthony PERARD 5 years ago

On Thu, Apr 18, 2019 at 12:26:18PM +0100, Ian Jackson wrote:
> 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).
> 
> CC: Anthony PERARD <anthony.perard@citrix.com>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

Acked-by: Anthony PERARD <anthony.perard@citrix.com>

-- 
Anthony PERARD

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel