[PATCH OSSTEST RFC v2 0/2] test mainline qemu and seabios branches

[PATCH OSSTEST RFC v2 0/2] test mainline qemu and seabios branches

[Ian Campbell]

Going for the award for most additional tags in $subject..

I've combined the two separate patches previously posted into one
series to keep things simpler.

The main change in v21 is that I have decided (mostly arbitrarily) that the
output repos should be /osstest/{seabios,qemu-mainline}.git.

This is still RFC since it has only been tested up to the make-flight
stage. Assuming there is in-principal agreement on this I'll do the
infrastructure setup bits and some manually cr-daily-branch invocations
before dropping the RFC tag.

Ian.

[PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch.

[Ian Campbell]

The naming here is slightly confused because we call our branches of qemuu on
xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct.

I've introduced $qemuubranch along the lines of $xenbranch, it is normally set
to qemu-upstream-{X.Y,unstable} but for the qemu-mainline flight it instead
points to qemu-mainline.

I've run up to the make-flight bit of cr-daily-branch and it differs only in
the expected ways from a standard xen-unstable branch (i.e. uses xen.git#master
and qemu.git#master).

I did consider causing make-flight:job_create_test_filter_callback to omit any
test which didn't use qemuu but I decided not to because it is used for PV
qdisk backends too.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: - Finalised repo names on xenbits as /osstest/qemu-mainline.git (and
      removed associated changelog comment about not being sure)
    - Removed wanderings about qemu-upstream filtering from commit log too.
---
 ap-common            | 5 +++++
 ap-fetch-version     | 4 ++++
 ap-fetch-version-old | 4 ++++
 ap-print-url         | 3 +++
 ap-push              | 5 +++++
 cr-daily-branch      | 5 ++---
 cr-for-branches      | 2 +-
 cri-common           | 4 ++++
 8 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ap-common b/ap-common
index ed37811..0969ab3 100644
--- a/ap-common
+++ b/ap-common
@@ -70,6 +70,11 @@ fi
 : ${TREE_QEMU_UPSTREAM:=git://xenbits.xen.org/staging/qemu-upstream-${xenbranch#xen-}.git}
 : ${LOCALREV_QEMU_UPSTREAM:=daily-cron.$branch}
 
+: ${TREE_QEMU_MAINLINE:=git://git.qemu.org/qemu.git}
+: ${BASE_TREE_QEMU_MAINLINE:=git://xenbits.xen.org/osstest/qemu-mainline.git}
+: ${PUSH_TREE_QEMU_MAINLINE:=$XENBITS:/home/xen/git/osstest/qemu-mainline.git}
+: ${LOCALREV_QEMU_MAINLINE:=daily-cron.$branch}
+
 info_linux_tree () {
 	case $1 in
 
diff --git a/ap-fetch-version b/ap-fetch-version
index 7cc2d98..a4558ea 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -49,6 +49,10 @@ xen-4.*-testing)
 	repo_tree_rev_fetch_git xen \
 		$TREE_XEN staging-$branchcore $LOCALREV_XEN
 	;;
+qemu-mainline)
+	repo_tree_rev_fetch_git $branch \
+		$TREE_QEMU_MAINLINE master $LOCALREV_QEMU_UPSTREAM
+	;;
 qemu-upstream-*)
         repo_tree_rev_fetch_git $branch \
 		$TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 3879e09..f71626f 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -54,6 +54,10 @@ xen-4.*-testing)
 	repo_tree_rev_fetch_git xen \
 		$TREE_XEN stable-$branchcore $LOCALREV_XEN
 	;;
+qemu-mainline)
+        repo_tree_rev_fetch_git $branch \
+		$BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE
+        ;;
 qemu-upstream-*)
         repo_tree_rev_fetch_git $branch \
 		$BASE_TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM
diff --git a/ap-print-url b/ap-print-url
index b1af0b9..a21efce 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -34,6 +34,9 @@ case "$branch" in
 xen*)
         echo $TREE_XEN
 	;;
+qemu-mainline)
+        echo $TREE_QEMU_MAINLINE
+        ;;
 qemu-upstream-*)
         echo $TREE_QEMU_UPSTREAM
         ;;
diff --git a/ap-push b/ap-push
index 674559f..00e0d8b 100755
--- a/ap-push
+++ b/ap-push
@@ -30,6 +30,7 @@ select_xenbranch
 . ap-common
 
 TREE_LINUX=$PUSH_TREE_LINUX
+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
@@ -57,6 +58,10 @@ xen-*-testing)
 	xenversion=${xenversion#xen-}
 	git push $TREE_XEN $revision:stable-$xenversion
 	;;
+qemu-mainline)
+	cd $repos/qemu-mainline
+	git push $TREE_QEMU_MAINLINE $revision:xen-tested-master
+	;;
 qemu-upstream-*)
 	cd $repos/$branch
         git push $TREE_QEMU_UPSTREAM $revision:master
diff --git a/cr-daily-branch b/cr-daily-branch
index 0cafe39..837cf7a 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -111,8 +111,7 @@ if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then
         xen-3.*|xen-4.[01]-*)
         	;;
 	*)
-		REVISION_QEMU_UPSTREAM="`fetch_version \
-				qemu-upstream-${xenbranch#xen-}`"
+		REVISION_QEMU_UPSTREAM="`fetch_version $qemuubranch`"
 		;;
         esac
         export REVISION_QEMU_UPSTREAM
@@ -166,7 +165,7 @@ osstest)
 	fi
 	;;
 qemuu)
-	realtree=qemu-upstream-${xenbranch#xen-}
+	realtree=$qemuubranch
 	NEW_REVISION=$REVISION_QEMU_UPSTREAM
         ;;
 linuxfirmware)
diff --git a/cr-for-branches b/cr-for-branches
index 60611d1..bded06f 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-unstable 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 ${EXTRA_BRANCHES}}
 export BRANCHES
 
 fetchwlem=$wlem
diff --git a/cri-common b/cri-common
index d82312c..d901383 100644
--- a/cri-common
+++ b/cri-common
@@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () {
 select_xenbranch () {
 	case "$branch" in
 	xen*)			tree=xen;	xenbranch=$branch ;;
+	qemu-mainline)		tree=qemuu;	xenbranch=xen-unstable	qemuubranch=qemu-mainline;;
         qemu-upstream-*)    tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};;
 	linux)			tree=linux;	xenbranch=xen-unstable ;;
 	linux-*)		tree=linux;	xenbranch=xen-unstable ;;
@@ -55,6 +56,9 @@ select_xenbranch () {
 	else
 		linuxbranch=''
 	fi
+	if [ x$qemuubranch = x ]; then
+		qemuubranch="qemu-upstream-${xenbranch#xen-}"
+	fi
 }
 
 select_branch () {
-- 
1.9.0

[PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch

[Ian Campbell]

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>
---
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          |  5 +++++
 mfi-common           |  5 ++++-
 ts-xen-build         |  3 +++
 11 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/ap-common b/ap-common
index 0969ab3..1f41ea0 100644
--- a/ap-common
+++ b/ap-common
@@ -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}
 
diff --git a/ap-fetch-version b/ap-fetch-version
index a4558ea..9f65fca 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -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
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index f71626f..d1a64dc 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_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
diff --git a/ap-print-url b/ap-print-url
index a21efce..637c9cc 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -55,6 +55,9 @@ libvirt)
 gnulib-libvirt)
 	echo $TREE_GNULIB_LIBVIRT
 	;;
+seabios)
+	echo $TREE_SEABIOS
+	;;
 osstest)
 	echo none:;
 	;;
diff --git a/ap-push b/ap-push
index 00e0d8b..c110e78 100755
--- a/ap-push
+++ b/ap-push
@@ -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: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 837cf7a..82280a4 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -132,6 +132,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
@@ -176,6 +184,10 @@ libvirt)
 	realtree=libvirt
 	NEW_REVISION=$REVISION_LIBVIRT
 	;;
+seabios)
+	realtree=seabios
+	NEW_REVISION=$REVISION_SEABIOS
+	;;
 *)
 	NEW_REVISION=''
 	wantpush=false
diff --git a/cr-for-branches b/cr-for-branches
index bded06f..5ed0a17 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-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
diff --git a/cri-common b/cri-common
index d901383..b180c4f 100644
--- a/cri-common
+++ b/cri-common
@@ -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
diff --git a/make-flight b/make-flight
index aadf58b..993416f 100755
--- a/make-flight
+++ b/make-flight
@@ -67,6 +67,11 @@ job_create_test_filter_callback () {
     libvirt)
       if [ x$toolstack != xlibvirt ] ; then return 1; fi
       ;;
+    seabios)
+      case $xenarch in
+          x86_64|x86_32) ;;
+          *) return 1;;
+      esac
     *)
       case "$job" in
         *-qemuu-*)
diff --git a/mfi-common b/mfi-common
index 3cfd3ea..bf18301 100644
--- a/mfi-common
+++ b/mfi-common
@@ -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                           \
diff --git a/ts-xen-build b/ts-xen-build
index 7ac46ea..5a764fd 100755
--- a/ts-xen-build
+++ b/ts-xen-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
-- 
1.9.0

Re: [PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch.

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch."):
> The naming here is slightly confused because we call our branches of qemuu on
> xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct.

IMO the tree in osstest/ should be called "qemu.git".  It's not got a
different git history to the qemu-upstream-foo.  The "mainline"
should be in the ref name.

> +qemu-mainline)
> +        repo_tree_rev_fetch_git $branch \
> +		$BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE

Maybe some / in the branch name ?

> diff --git a/cri-common b/cri-common
> index d82312c..d901383 100644
> --- a/cri-common
> +++ b/cri-common
> @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () {
>  select_xenbranch () {
>  	case "$branch" in
>  	xen*)			tree=xen;	xenbranch=$branch ;;
> +	qemu-mainline)		tree=qemuu;	xenbranch=xen-unstable	qemuubranch=qemu-mainline;;
>          qemu-upstream-*)    tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};;
>  	linux)			tree=linux;	xenbranch=xen-unstable ;;
>  	linux-*)		tree=linux;	xenbranch=xen-unstable ;;
> @@ -55,6 +56,9 @@ select_xenbranch () {
>  	else
>  		linuxbranch=''
>  	fi
> +	if [ x$qemuubranch = x ]; then
> +		qemuubranch="qemu-upstream-${xenbranch#xen-}"
> +	fi

Perhaps it would be easier to move the default setting of qemuubranch
above the case, where it wouldn't need to be conditional.

Ian.

Re: [PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch"):
> Most of this is the usual stuff for adding a new branch.
...
> +seabios)
> +	cd $repos/seabios
> +	git push $TREE_SEABIOS $revision:xen-tested-master

Again, maybe the ref name should be something with some /s in ?

The meat of this and the other patch looks good to me.

Thanks,
Ian.

Re: [PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch.

[Ian Campbell]

On Mon, 2014-05-12 at 16:15 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch."):
> > The naming here is slightly confused because we call our branches of qemuu on
> > xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct.
> 
> IMO the tree in osstest/ should be called "qemu.git".  It's not got a
> different git history to the qemu-upstream-foo.

OK

> The "mainline" should be in the ref name.

Currently the ref name is xen-tested-master, because the input branch
from upstream is called master. xen-tested-mainline-master perhaps?

> 
> > +qemu-mainline)
> > +        repo_tree_rev_fetch_git $branch \
> > +		$BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE
> 
> Maybe some / in the branch name ?

FWIW libvirt uses the same ref name, but I'm happy to change if you
would prefer, although I'm not sure what the benefit would be. Anyway,
what would you suggest?

> > diff --git a/cri-common b/cri-common
> > index d82312c..d901383 100644
> > --- a/cri-common
> > +++ b/cri-common
> > @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () {
> >  select_xenbranch () {
> >  	case "$branch" in
> >  	xen*)			tree=xen;	xenbranch=$branch ;;
> > +	qemu-mainline)		tree=qemuu;	xenbranch=xen-unstable	qemuubranch=qemu-mainline;;
> >          qemu-upstream-*)    tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};;
> >  	linux)			tree=linux;	xenbranch=xen-unstable ;;
> >  	linux-*)		tree=linux;	xenbranch=xen-unstable ;;
> > @@ -55,6 +56,9 @@ select_xenbranch () {
> >  	else
> >  		linuxbranch=''
> >  	fi
> > +	if [ x$qemuubranch = x ]; then
> > +		qemuubranch="qemu-upstream-${xenbranch#xen-}"
> > +	fi
> 
> Perhaps it would be easier to move the default setting of qemuubranch
> above the case, where it wouldn't need to be conditional.

Yes, good suggestion.

Ian.

Re: [PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch

[Ian Campbell]

On Mon, 2014-05-12 at 16:18 +0100, Ian Jackson wrote:
> The meat of this and the other patch looks good to me.

WRT 0/2's comment:
        This is still RFC since it has only been tested up to the
        make-flight stage. Assuming there is in-principal agreement on
        this I'll do the infrastructure setup bits and some manually
        cr-daily-branch invocations before dropping the RFC tag.

I'm going to take this as the go ahead to start doing that (when I find
a moment)

Ian.

Re: [PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch.

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch."):
> On Mon, 2014-05-12 at 16:15 +0100, Ian Jackson wrote:
> > The "mainline" should be in the ref name.
> 
> Currently the ref name is xen-tested-master, because the input branch
> from upstream is called master. xen-tested-mainline-master perhaps?

Given what you say below, how about mainline/xen-tested-master ?

> > > +qemu-mainline)
> > > +        repo_tree_rev_fetch_git $branch \
> > > +		$BASE_TREE_QEMU_MAINLINE xen-tested-master $LOCALREV_QEMU_MAINLINE
> > 
> > Maybe some / in the branch name ?
> 
> FWIW libvirt uses the same ref name, but I'm happy to change if you
> would prefer, although I'm not sure what the benefit would be. Anyway,
> what would you suggest?

Oh, consistency above pickiness.  So xen-tested-master is right.

Ian.

Re: [PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch"):
> On Mon, 2014-05-12 at 16:18 +0100, Ian Jackson wrote:
> > The meat of this and the other patch looks good to me.
> 
> WRT 0/2's comment:
>         This is still RFC since it has only been tested up to the
>         make-flight stage. Assuming there is in-principal agreement on
>         this I'll do the infrastructure setup bits and some manually
>         cr-daily-branch invocations before dropping the RFC tag.
> 
> I'm going to take this as the go ahead to start doing that (when I find
> a moment)

Yes.

Thanks,
Ian.

Re: [PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch

[Ian Campbell]

On Mon, 2014-05-12 at 16:18 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch"):
> > Most of this is the usual stuff for adding a new branch.
> ...
> > +seabios)
> > +	cd $repos/seabios
> > +	git push $TREE_SEABIOS $revision:xen-tested-master
> 
> Again, maybe the ref name should be something with some /s in ?

FYI I ended up with
	$XENBITS/osstest/qemu.git#mainline/xen-tested-master
	$XENBITS/osstest/seabios.git#xen-tested-master

Ian.

Re: [PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch.

[Ian Campbell]

On Mon, 2014-05-12 at 16:21 +0100, Ian Campbell wrote:
> > > diff --git a/cri-common b/cri-common
> > > index d82312c..d901383 100644
> > > --- a/cri-common
> > > +++ b/cri-common
> > > @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () {
> > >  select_xenbranch () {
> > >  	case "$branch" in
> > >  	xen*)			tree=xen;	xenbranch=$branch ;;
> > > +	qemu-mainline)		tree=qemuu;	xenbranch=xen-unstable	qemuubranch=qemu-mainline;;
> > >          qemu-upstream-*)    tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};;
> > >  	linux)			tree=linux;	xenbranch=xen-unstable ;;
> > >  	linux-*)		tree=linux;	xenbranch=xen-unstable ;;
> > > @@ -55,6 +56,9 @@ select_xenbranch () {
> > >  	else
> > >  		linuxbranch=''
> > >  	fi
> > > +	if [ x$qemuubranch = x ]; then
> > > +		qemuubranch="qemu-upstream-${xenbranch#xen-}"
> > > +	fi
> > 
> > Perhaps it would be easier to move the default setting of qemuubranch
> > above the case, where it wouldn't need to be conditional.
> 
> Yes, good suggestion.

Actually no: It uses $xenbranch which is set by the case.

Ian.

Re: [PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH OSSTEST RFC v2 2/2] Add a flight to test seabios.org's master branch"):
> On Mon, 2014-05-12 at 16:18 +0100, Ian Jackson wrote:
> > Again, maybe the ref name should be something with some /s in ?
> 
> FYI I ended up with
> 	$XENBITS/osstest/qemu.git#mainline/xen-tested-master
> 	$XENBITS/osstest/seabios.git#xen-tested-master

Fair enough.

Ian.