[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [OSSTEST] Add a flight to test qemu.org's ("mainline") master branch.
On Fri, Apr 25, 2014 at 04:33:01PM +0100, Ian Campbell wrote: > 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. (and now I'm wondering why the same doesn't apply to the > qemu-upstream flights too) > > I'm not sure what to call the output of the push gate on xenbits to be not > confusing, git://xenbits.xen.org/osstest/qemu.git is a placeholder. The XXX > should be removed before committing. I wondered about suggesting moving all of > the push gates which aren't actually intended for end user consumption (but > rather for osstest book-keeping) under e.g. > git://xenbits.xen.org/osstest-gated, that would be the libvirt tree, the linux > trees which linux-linus and linux-next push to, this new tree, perhaps others. > > Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> Woot! <Very happy Konrad!> Can't review it as I don't know much about oss-test but thank you for implementing this! > --- > 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 4cae650..07f46a7 100644 > --- a/ap-common > +++ b/ap-common > @@ -72,6 +72,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.git} # XXX > ??? > +: ${PUSH_TREE_QEMU_MAINLINE:=$XENBITS:/home/xen/git/osstest/qemu.git} # XXX > ??? > +: ${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 69f88a3..303345d 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 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@xxxxxxxxxxxxx > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |