@@ -39,6 +39,10 @@
: ${TREE_GNULIB_LIBVIRT:=git://git.sv.gnu.org/gnulib.git}
+: ${TREE_SEABIOS:=git://git.seabios.org/seabios.git}
+: ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git}
+: ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.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}
@@ -64,6 +68,7 @@ fi
: ${LOCALREV_LINUX:=daily-cron.$branch}
: ${LOCALREV_LIBVIRT:=daily-cron.$branch}
: ${LOCALREV_GNULIB_LIBVIRT:=daily-cron.$branch}
+: ${LOCALREV_SEABIOS:=daily-cron.$branch}
: ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27}
@@ -81,6 +81,10 @@ gnulib-libvirt)
repo_tree_rev_fetch_git gnulib-libvirt \
$TREE_GNULIB_LIBVIRT master $LOCALREV_GNULIB_LIBVIRT
;;
+seabios)
+ repo_tree_rev_fetch_git seabios \
+ $TREE_SEABIOS master $LOCALREV_SEABIOS
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
git fetch $HOME/testing.git pretest:ap-fetch >&2
@@ -28,6 +28,7 @@ select_xenbranch
: ${BASE_TAG_LINUX2639:=tested/2.6.39.x}
: ${BASE_LOCALREV_LINUX:=daily-cron.$branch.old}
: ${BASE_LOCALREV_LIBVIRT:=daily-cron.$branch.old}
+: ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old}
: ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}}
@@ -86,6 +87,10 @@ gnulib-libvirt)
# No push gate, same as ap-fetch-version
./ap-fetch-version $branch
;;
+seabios)
+ repo_tree_rev_fetch_git seabios \
+ $BASE_TREE_SEABIOS xen-tested-master $BASE_LOCALREV_SEABIOS
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
git fetch -f $HOME/testing.git incoming:ap-fetch
@@ -55,6 +55,9 @@ libvirt)
gnulib-libvirt)
echo $TREE_GNULIB_LIBVIRT
;;
+seabios)
+ echo $TREE_SEABIOS
+ ;;
osstest)
echo none:;
;;
@@ -34,6 +34,7 @@ TREE_QEMU_MAINLINE=$PUSH_TREE_QEMU_MAINLINE
TREE_QEMU_UPSTREAM=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git
TREE_XEN=$PUSH_TREE_XEN
TREE_LIBVIRT=$PUSH_TREE_LIBVIRT
+TREE_SEABIOS=$PUSH_TREE_SEABIOS
if info_linux_tree "$branch"; then
cd $repos/linux
@@ -87,6 +88,10 @@ gnulib-libvirt)
echo "gnulib-libvirt has not push gate, refusing to push" >&2
exit 1
;;
+seabios)
+ cd $repos/seabios
+ git push $TREE_SEABIOS $revision:refs/heads/xen-tested-master
+ ;;
osstest)
git push $HOME/testing.git $revision:incoming
git push $XENBITS:/home/xen/git/osstest.git $revision:master
@@ -136,6 +136,14 @@ if [ "x$REVISION_LINUX_ARM" = x ]; then
export REVISION_LINUX_ARM
fi
fi
+if [ "x$REVISION_SEABIOS" = x ]; then
+ if [ "x$tree" = "xseabios" ]; then
+ determine_version REVISION_SEABIOS seabios
+ export REVISION_SEABIOS
+ else
+ : REVISION_SEABIOS from Config.mk
+ fi
+fi
if [ "x$REVISION_LIBVIRT" = x ]; then
determine_version REVISION_LIBVIRT libvirt
export REVISION_LIBVIRT
@@ -180,6 +188,10 @@ libvirt)
realtree=libvirt
NEW_REVISION=$REVISION_LIBVIRT
;;
+seabios)
+ realtree=seabios
+ NEW_REVISION=$REVISION_SEABIOS
+ ;;
*)
NEW_REVISION=''
wantpush=false
@@ -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-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen ${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-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen seabios ${EXTRA_BRANCHES}}
export BRANCHES
fetchwlem=$wlem
@@ -49,6 +49,7 @@ select_xenbranch () {
linux-*) tree=linux; xenbranch=xen-unstable ;;
linuxfirmware) tree=linuxfirmware; xenbranch=xen-unstable ;;
libvirt) tree=libvirt; xenbranch=xen-unstable ;;
+ seabios) tree=seabios; xenbranch=xen-unstable ;;
osstest) tree=osstest; xenbranch=xen-unstable ;;
esac
if [ "x$tree" = xlinux ]; then
@@ -67,6 +67,12 @@ job_create_test_filter_callback () {
libvirt)
if [ x$toolstack != xlibvirt ] ; then return 1; fi
;;
+ seabios)
+ case $xenarch in
+ amd64|i386) ;;
+ *) return 1;;
+ esac
+ ;;
*)
case "$job" in
*-qemuu-*)
@@ -52,6 +52,7 @@ create_build_jobs () {
linux-mingo-tip-master) continue;;
linux-*) ;;
qemu-*) continue;;
+ seabios) continue;;
esac
case "$xenbranch" in
xen-3.*-testing) continue;;
@@ -131,12 +132,14 @@ create_build_jobs () {
tree_qemu=$TREE_QEMU \
tree_qemuu=$TREE_QEMU_UPSTREAM \
tree_xen=$TREE_XEN \
+ tree_seabios=$TREE_SEABIOS \
$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_qemuu=$REVISION_QEMU_UPSTREAM \
+ revision_seabios=$REVISION_SEABIOS
if [ $build_extraxend = "true" ] ; then
./cs-job-create $flight build-$arch-xend build \
@@ -67,6 +67,9 @@ END
(nonempty($r{revision_qemuu}) ? <<END : '').
echo >>.config QEMU_UPSTREAM_REVISION='$r{revision_qemuu}'
END
+ (nonempty($r{tree_seabios}) ? <<END : '').
+ echo >>.config SEABIOS_UPSTREAM_URL='$r{tree_seabios}'
+END
(nonempty($r{revision_seabios}) ? <<END : '').
echo >>.config SEABIOS_UPSTREAM_TAG='$r{revision_seabios}'
END
Most of this is the usual stuff for adding a new branch. cr-daily-branch needed to set REVISION_SEABIOS for the seabios branch and leave it blank for others (so that Config.mk's version will be used). ts-xen-build already consumes the resulting version runvar but needed to be taught about the tree URL runvar. make-flight and mfi-common are updated to only build+test seabios on x86. The new branch is added to cr-daily-branches. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- v3: - ap-push to refs/heads/... v2: - finaled repo names on xenbits as /osstest/seabios.git - stop trying to filter non-qemuu flights, there aren't many and getting the right ones is tricky. --- ap-common | 5 +++++ ap-fetch-version | 4 ++++ ap-fetch-version-old | 5 +++++ ap-print-url | 3 +++ ap-push | 5 +++++ cr-daily-branch | 12 ++++++++++++ cr-for-branches | 2 +- cri-common | 1 + make-flight | 6 ++++++ mfi-common | 5 ++++- ts-xen-build | 3 +++ 11 files changed, 49 insertions(+), 2 deletions(-)