|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH] Add a flight to test OVMF master branch
On Mon, Jan 12, 2015 at 04:07:46PM +0000, Ian Jackson wrote:
> Wei Liu writes ("[PATCH] Add a flight to test OVMF master branch"):
> > Do the usual stuffs for adding a new branch (ap-* cr-* etc).
> >
> > Modify ts-xen-build so that it builds Xen with the specified ovmf tree
> > and revision.
> >
> > Only build and test on x86 by modifying make-flight and mfi-common.
> >
> > New branch is added to cr-daily-branch. It exports the tree and
> > changeset used for the test if set. Otherwise the values in Config.mk
> > are used.
>
> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
>
> I guess you have tested this standalone, somewhat ?
>
I've checked the generated runvars. Both revision_ovmf and tree_ovmf are
added to build-* jobs. They look correct to me. I can attach runvars
outputs if you're interested.
Please find attach v2 of this patch.
> The next step would be to run an adhoc flight on the osstest VM, I
> think. Would you like me to do that ?
>
Yes. And osstest/ovmf.git doesn't exist yet, I presume you will take
care of that as well.
Wei.
> Ian.
From ccc54cc7f911fbc150818772c270baf06a280dfe Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@xxxxxxxxxx>
Date: Mon, 12 Jan 2015 14:51:42 +0000
Subject: [PATCH OSSTEST v2] Add a flight to test OVMF master branch
Cc: ian.campbell@xxxxxxxxxx, ian.jackson@xxxxxxxxxxxxx
Do the usual stuffs for adding a new branch (ap-* cr-* etc).
Modify ts-xen-build so that it builds Xen with the specified ovmf tree
and revision.
Only build and test on x86 by modifying make-flight and mfi-common.
New branch is added to cr-daily-branch. It exports the tree and
changeset used for the test if set. Otherwise the values in Config.mk
are used.
Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
v2: remove leading stray blank line that breaks ts-xen-build
---
ap-common | 5 +++++
ap-fetch-version | 4 ++++
ap-fetch-version-old | 5 +++++
ap-print-url | 3 +++
ap-push | 5 +++++
cr-daily-branch | 14 ++++++++++++++
cr-for-branches | 2 +-
cri-common | 1 +
make-flight | 6 ++++++
mfi-common | 5 ++++-
ts-xen-build | 6 ++++++
11 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/ap-common b/ap-common
index 96cbd14..e2c3e42 100644
--- a/ap-common
+++ b/ap-common
@@ -51,6 +51,10 @@
: ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git}
: ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.git}
+: ${TREE_OVMF_UPSTREAM:=https://github.com/tianocore/edk2.git}
+: ${PUSH_TREE_OVMF:=$XENBITS:/home/xen/git/osstest/ovmf.git}
+: ${BASE_TREE_OVMF:=git://xenbits.xen.org/osstest/ovmf.git}
+
: ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git}
: ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git}
:
${UPSTREAM_TREE_LINUXFIRMWARE:=$GIT_KERNEL_ORG/pub/scm/linux/kernel/git/firmware/linux-firmware.git}
@@ -77,6 +81,7 @@ fi
: ${LOCALREV_LIBVIRT:=daily-cron.$branch}
: ${LOCALREV_RUMPUSERXEN:=daily-cron.$branch}
: ${LOCALREV_SEABIOS:=daily-cron.$branch}
+: ${LOCALREV_OVMF:=daily-cron.$branch}
: ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27}
diff --git a/ap-fetch-version b/ap-fetch-version
index f6c65d8..33aaf00 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -85,6 +85,10 @@ seabios)
repo_tree_rev_fetch_git seabios \
$TREE_SEABIOS_UPSTREAM master $LOCALREV_SEABIOS
;;
+ovmf)
+ repo_tree_rev_fetch_git ovmf \
+ $TREE_OVMF_UPSTREAM master $LOCALREV_OVMF
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
git fetch $HOME/testing.git pretest:ap-fetch >&2
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 43c997c..7b7f50e 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -30,6 +30,7 @@ select_xenbranch
: ${BASE_LOCALREV_LIBVIRT:=daily-cron.$branch.old}
: ${BASE_LOCALREV_RUMPUSERXEN:=daily-cron.$branch.old}
: ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old}
+: ${BASE_LOCALREV_OVMF:=daily-cron.$branch.old}
: ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}}
@@ -92,6 +93,10 @@ seabios)
repo_tree_rev_fetch_git seabios \
$BASE_TREE_SEABIOS xen-tested-master $BASE_LOCALREV_SEABIOS
;;
+ovmf)
+ repo_tree_rev_fetch_git ovmf \
+ $BASE_TREE_OVMF xen-tested-master $BASE_LOCALREV_OVMF
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
git fetch -f $HOME/testing.git incoming:ap-fetch
diff --git a/ap-print-url b/ap-print-url
index 7b27e1e..3db2375 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -58,6 +58,9 @@ rumpuserxen)
seabios)
echo $TREE_SEABIOS_UPSTREAM
;;
+ovmf)
+ echo $TREE_OVMF_UPSTREAM
+ ;;
osstest)
echo none:;
;;
diff --git a/ap-push b/ap-push
index a2aa747..01089f3 100755
--- a/ap-push
+++ b/ap-push
@@ -36,6 +36,7 @@ TREE_XEN=$PUSH_TREE_XEN
TREE_LIBVIRT=$PUSH_TREE_LIBVIRT
TREE_RUMPUSERXEN=$PUSH_TREE_RUMPUSERXEN
TREE_SEABIOS=$PUSH_TREE_SEABIOS
+TREE_OVMF=$PUSH_TREE_OVMF
if info_linux_tree "$branch"; then
cd $repos/linux
@@ -92,6 +93,10 @@ seabios)
cd $repos/seabios
git push $TREE_SEABIOS $revision:refs/heads/xen-tested-master
;;
+ovmf)
+ cd $repos/ovmf
+ git push $TREE_OVMF $revision:refs/heads/xen-tested-master
+ ;;
osstest)
git push $HOME/testing.git $revision:incoming
git push $XENBITS:/home/xen/git/osstest.git $revision:master
diff --git a/cr-daily-branch b/cr-daily-branch
index fc663ce..c7d1071 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -146,6 +146,16 @@ if [ "x$REVISION_SEABIOS" = x ]; then
: REVISION_SEABIOS from Config.mk
fi
fi
+if [ "x$REVISION_OVMF" = x ]; then
+ if [ "x$tree" = "xovmf" ]; then
+ TREE_OVMF=$TREE_OVMF_UPSTREAM
+ export TREE_OVMF
+ determine_version REVISION_OVMF ovmf OVMF
+ export REVISION_OVMF
+ else
+ : REVISION_OVMF from Config.mk
+ fi
+fi
if [ "x$REVISION_LIBVIRT" = x ]; then
determine_version REVISION_LIBVIRT libvirt LIBVIRT
export REVISION_LIBVIRT
@@ -203,6 +213,10 @@ seabios)
realtree=seabios
NEW_REVISION=$REVISION_SEABIOS
;;
+ovmf)
+ realtree=ovmf
+ NEW_REVISION=$REVISION_OVMF
+ ;;
*)
NEW_REVISION=''
wantpush=false
diff --git a/cr-for-branches b/cr-for-branches
index f820087..65beb12 100755
--- a/cr-for-branches
+++ b/cr-for-branches
@@ -31,7 +31,7 @@ scriptoptions="$1"; shift
LOGFILE=tmp/cr-for-branches.log
export LOGFILE
-: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing
xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-unstable qemu-mainline
qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing
qemu-upstream-4.4-testing qemu-upstream-4.5-testing linux-3.14 linux-3.10
linux-3.4 linux-arm-xen seabios ${EXTRA_BRANCHES}}
+: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing
xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-unstable qemu-mainline
qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing
qemu-upstream-4.4-testing qemu-upstream-4.5-testing linux-3.14 linux-3.10
linux-3.4 linux-arm-xen seabios ovmf ${EXTRA_BRANCHES}}
export BRANCHES
fetchwlem=$wlem
diff --git a/cri-common b/cri-common
index 06a8d67..ad44546 100644
--- a/cri-common
+++ b/cri-common
@@ -71,6 +71,7 @@ select_xenbranch () {
libvirt) tree=libvirt; xenbranch=xen-unstable ;;
rumpuserxen) tree=rumpuserxen; xenbranch=xen-unstable ;;
seabios) tree=seabios; xenbranch=xen-unstable ;;
+ ovmf) tree=ovmf; xenbranch=xen-unstable ;;
osstest) tree=osstest; xenbranch=xen-unstable ;;
esac
if [ "x$tree" = xlinux ]; then
diff --git a/make-flight b/make-flight
index a91f256..68d3cf6 100755
--- a/make-flight
+++ b/make-flight
@@ -82,6 +82,12 @@ job_create_test_filter_callback () {
*) return 1;;
esac
;;
+ ovmf)
+ case $xenarch in
+ amd64|i386) ;;
+ *) return 1;;
+ esac
+ ;;
*)
case "$job" in
*-qemuu-*)
diff --git a/mfi-common b/mfi-common
index e167606..b03388b 100644
--- a/mfi-common
+++ b/mfi-common
@@ -66,6 +66,7 @@ create_build_jobs () {
qemu-upstream-4.4-testing) continue;;
rumpuserxen) continue;;
seabios) continue;;
+ ovmf) continue;;
esac
case "$xenbranch" in
xen-3.*-testing) continue;;
@@ -145,13 +146,15 @@ create_build_jobs () {
tree_qemuu=$TREE_QEMU_UPSTREAM \
tree_xen=$TREE_XEN \
tree_seabios=$TREE_SEABIOS \
+ tree_ovmf=$TREE_OVMF \
$RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
$suite_runvars \
host_hostflags=$build_hostflags \
revision_xen=$REVISION_XEN \
revision_qemu=$REVISION_QEMU \
revision_qemuu=$REVISION_QEMU_UPSTREAM \
- revision_seabios=$REVISION_SEABIOS
+ revision_seabios=$REVISION_SEABIOS \
+ revision_ovmf=$REVISION_OVMF
if [ $build_extraxend = "true" ] ; then
./cs-job-create $flight build-$arch-xend build \
diff --git a/ts-xen-build b/ts-xen-build
index 661f186..370bfbc 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -67,6 +67,12 @@ END
(nonempty($r{revision_seabios}) ? <<END : '').
echo >>.config SEABIOS_UPSTREAM_TAG='$r{revision_seabios}'
END
+ (nonempty($r{tree_ovmf}) ? <<END : '').
+ echo >>.config OVMF_UPSTREAM_URL='$r{tree_ovmf}'
+END
+ (nonempty($r{revision_ovmf}) ? <<END : '').
+ echo >>.config OVMF_UPSTREAM_REVISION='$r{revision_ovmf}'
+END
(nonempty($earlyprintk) ? <<END : '').
echo >>.config CONFIG_EARLY_PRINTK=$earlyprintk
END
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |