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.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ap-common b/ap-common
index 96cbd14573306d4f11b5a0655f82f0ac7308edda..e2c3e42d3c4b4f28c68ba569c3de879586f602d4 100644 (file)
--- 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 f6c65d8f18aaecb61083e858825e0695da2bb074..33aaf00b64456ae95dfc199884a16249478c66ce 100755 (executable)
--- 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 43c997c0bf826080e77e7c807be24278e19b4bad..7b7f50eaceb926cf3b53535dafa200b312ab4799 100755 (executable)
--- 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 7b27e1ef36b343f050d3b5b7f92317c14faccb4b..3db237514d8e0fd4ae87c37787d121327b1ec198 100755 (executable)
--- 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 a2aa7473bffd749d4e94fc4621a8a820e35b20ac..01089f363bc94cf10d7d65f88137dc3100deb4a7 100755 (executable)
--- 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 fc663cebb567753f4cdbf35afdb0b619164828e7..c7d10717d0c1e67e970248eda29ddb8bbc546383 100755 (executable)
--- 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 f820087ffd7d149d23ac154c52308af37e2dd655..65beb12dc3ba8ac33aaac243e97f566aa8ab91d9 100755 (executable)
--- 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 06a8d678d42756834c0dfd95312d3ef877737c53..ad44546eb7de7cea2936cc35b80620a4e876ca1b 100644 (file)
--- 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 9b499d82c166a1bd7aacca1ec54591462d05a36b..63b14f5cf6526ab48eb79d03dc4e726b595e71ca 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -83,6 +83,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 7ccff40f7acbfa3e8c60365b2b01555560676f9b..44b67527e94b01e8c2e32c2bfde276be826f7865 100644 (file)
--- 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;;
@@ -146,13 +147,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 661f1860cd5d663208e9fc7cea19c3a4d01977c7..370bfbc27ae610acff1a3cdf64ab9cbd1d3be0dc 100755 (executable)
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -66,6 +66,12 @@ END
 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