[OSSTEST PATCH 13/13] rump kernels: Create a "branch" for rump kernel tests

[Ian Jackson <ian.jackson@eu.citrix.com>]

This is a traditional push gate.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ap-common            |    3 +++
 ap-fetch-version     |    4 ++++
 ap-fetch-version-old |    5 +++++
 ap-print-url         |    3 +++
 ap-push              |    5 +++++
 cr-daily-branch      |   10 ++++++++++
 cri-common           |    1 +
 crontab              |    3 ++-
 make-flight          |    9 +++++++++
 mfi-common           |    1 +
 10 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/ap-common b/ap-common
index d7933f1..b7d03b5 100644
--- a/ap-common
+++ b/ap-common
@@ -43,6 +43,8 @@
 
 : ${TREE_RUMPUSERXEN:=https://github.com/rumpkernel/rumpuser-xen}
 : ${TREEVCS_RUMPUSERXEN:=git}
+: ${BASE_TREE_RUMPUSERXEN:=git://xenbits.xen.org/rumpuser-xen.git}
+: ${PUSH_TREE_RUMPUSERXEN:=$XENBITS:/home/xen/git/rumpuser-xen.git}
 
 : ${TREE_RUMPUSERXEN_RUMPSRC:=https://github.com/rumpkernel/rumpkernel-netbsd-src}
 : ${TREEVCS_RUMPUSERXEN_RUMPSRC:=git}
@@ -72,6 +74,7 @@ fi
 : ${LOCALREV_LINUX:=daily-cron.$branch}
 : ${LOCALREV_LIBVIRT:=daily-cron.$branch}
 : ${LOCALREV_GNULIB_LIBVIRT:=daily-cron.$branch}
+: ${LOCALREV_RUMPUSERXEN:=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 7cc2d98..c67fb2f 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -77,6 +77,10 @@ gnulib-libvirt)
 	repo_tree_rev_fetch_git gnulib-libvirt \
 		$TREE_GNULIB_LIBVIRT master $LOCALREV_GNULIB_LIBVIRT
 	;;
+rumpuserxen)
+	repo_tree_rev_fetch_git rumpuserxen \
+		$TREE_RUMPUSERXEN master $LOCALREV_RUMPUSERXEN
+	;;
 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 3879e09..de88245 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -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_RUMPUSERXEN:=daily-cron.$branch.old}
 
 : ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}}
 
@@ -78,6 +79,10 @@ libvirt)
 	repo_tree_rev_fetch_git libvirt \
 		$BASE_TREE_LIBVIRT xen-tested-master $BASE_LOCALREV_LIBVIRT
 	;;
+rumpuserxen)
+	repo_tree_rev_fetch_git rumpuserxen \
+		$BASE_TREE_RUMPUSERXEN xen-tested-master $BASE_LOCALREV_RUMPUSERXEN
+	;;
 gnulib-libvirt)
 	# No push gate, same as ap-fetch-version
 	./ap-fetch-version $branch
diff --git a/ap-print-url b/ap-print-url
index b1af0b9..8bcf396 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -52,6 +52,9 @@ libvirt)
 gnulib-libvirt)
 	echo $TREE_GNULIB_LIBVIRT
 	;;
+rumpuserxen)
+	echo $TREE_RUMPUSERXEN
+	;;
 osstest)
 	echo none:;
 	;;
diff --git a/ap-push b/ap-push
index 674559f..5c39b26 100755
--- a/ap-push
+++ b/ap-push
@@ -33,6 +33,7 @@ TREE_LINUX=$PUSH_TREE_LINUX
 TREE_QEMU_UPSTREAM=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git
 TREE_XEN=$PUSH_TREE_XEN
 TREE_LIBVIRT=$PUSH_TREE_LIBVIRT
+TREE_RUMPUSERXEN=$PUSH_TREE_RUMPUSERXEN
 
 if info_linux_tree "$branch"; then
 	cd $repos/linux
@@ -77,6 +78,10 @@ libvirt)
 	cd $repos/libvirt
 	git push $TREE_LIBVIRT $revision:xen-tested-master
 	;;
+rumpuserxen)
+	cd $repos/rumpuserxen
+	git push $TREE_RUMPUSERXEN $revision:xen-tested-master
+	;;
 gnulib-libvirt)
 	# No gate
 	echo "gnulib-libvirt has not push gate, refusing to push" >&2
diff --git a/cr-daily-branch b/cr-daily-branch
index 0cafe39..a7fe8db 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -141,6 +141,10 @@ if [ "x$REVISION_GNULIB_LIBVIRT" = x ]; then
 	determine_version REVISION_GNULIB_LIBVIRT gnulib-libvirt
 	export REVISION_GNULIB_LIBVIRT
 fi
+if [ "x$REVISION_RUMPUSERXEN" = x ]; then
+	determine_version REVISION_RUMPUSERXEN rumpuserxen
+	export REVISION_RUMPUSERXEN
+fi
 if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
 	determine_version REVISION_LINUXFIRMWARE linuxfirmware
         export REVISION_LINUXFIRMWARE
@@ -177,6 +181,12 @@ libvirt)
 	realtree=libvirt
 	NEW_REVISION=$REVISION_LIBVIRT
 	;;
+rumpuserxen)
+	realtree=rumpuserxen
+	NEW_REVISION=$REVISION_RUMPUSERXEN
+	export REVISION_LINUX_OLD=disable
+	export REVISION_LIBVIRT=disable
+	;;
 *)
 	NEW_REVISION=''
 	wantpush=false
diff --git a/cri-common b/cri-common
index d82312c..cd9112c 100644
--- a/cri-common
+++ b/cri-common
@@ -48,6 +48,7 @@ select_xenbranch () {
 	linux-*)		tree=linux;	xenbranch=xen-unstable ;;
 	linuxfirmware)	    tree=linuxfirmware;	xenbranch=xen-unstable ;;
 	libvirt)		tree=libvirt;	xenbranch=xen-unstable ;;
+	rumpuserxen)	      tree=rumpuserxen; xenbranch=xen-unstable ;;
 	osstest)		tree=osstest;	xenbranch=xen-unstable ;;
 	esac
 	if [ "x$tree" = xlinux ]; then
diff --git a/crontab b/crontab
index 002876a..f83bd78 100644
--- a/crontab
+++ b/crontab
@@ -8,6 +8,7 @@ MAILTO=ian.jackson@citrix.com,ian.campbell@eu.citrix.com
 18		11	* * *		cd testing.git && BRANCHES=linux-mingo-tip-master ./cr-for-branches branches -w "./cr-daily-branch --real"
 18		12	* * *		cd testing.git && BRANCHES=linux-3.0		./cr-for-branches branches -w "./cr-daily-branch --real"
 18		13	* * *		cd testing.git && BRANCHES=libvirt		./cr-for-branches branches -w "./cr-daily-branch --real"
-6-59/15   	*	* * *		cd testing.git && EXTRA_BRANCHES='linux-linus linux-3.0' ./cr-for-branches bisects -w "./cr-try-bisect --real"
+18		14	* * *		cd testing.git && BRANCHES=rumpuserxen		./cr-for-branches branches -w "./cr-daily-branch --real"
+6-59/15   	*	* * *		cd testing.git && EXTRA_BRANCHES='linux-linus linux-3.0 rumpuserxen' ./cr-for-branches bisects -w "./cr-try-bisect --real"
 #8-59/5		*	* * *		cd bisects/adhoc.git &&	with-lock-ex -q data-tree-lock bash -c "./cr-try-bisect-adhoc; exit $?"
 3		5	* * *		savelog -c28 testing.git/tmp/cr-for-branches.log >/dev/null
diff --git a/make-flight b/make-flight
index 5bac70e..dd679e8 100755
--- a/make-flight
+++ b/make-flight
@@ -67,6 +67,15 @@ job_create_test_filter_callback () {
     libvirt)
       if [ x$toolstack != xlibvirt ] ; then return 1; fi
       ;;
+    rumpuserxen)
+      case "$job" in
+      *-rumpuserxen-*)
+          ;;
+      *)
+          : "suppressed $job"
+          return 1;;
+      esac
+      ;;
     *)
       case "$job" in
         *-qemuu-*)
diff --git a/mfi-common b/mfi-common
index 7c5f301..ff3c57e 100644
--- a/mfi-common
+++ b/mfi-common
@@ -52,6 +52,7 @@ create_build_jobs () {
       linux-mingo-tip-master) continue;;
       linux-*) ;;
       qemu-*) continue;;
+      rumpuserxen) continue;;
       esac
       case "$xenbranch" in
       xen-3.*-testing) continue;;
-- 
1.7.10.4