Xen project Mailing List

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

To: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>

From: Ian Campbell <ian.campbell@xxxxxxxxxx>

Date: Fri, 2 Oct 2015 14:53:09 +0100

Cc: stefano.stabellini@xxxxxxxxxxxxx, wei.liu2@xxxxxxxxxx, xen-devel@xxxxxxxxxxxxx

Delivery-date: Fri, 02 Oct 2015 13:53:19 +0000

List-id: Xen developer discussion <xen-devel.lists.xen.org>

On Fri, 2015-10-02 at 14:43 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{, > -traditional}.git trees"): > > $branch is a bit wordy at this point, but $branchcore is usable for > > both > > cases incrementally: > > LGTM. > > Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> > > (I assume you'll fold this in.) Yes, v2 is below for completeness. I rebased this over the smoketest stuff which added $xenbranch_forqemu which of course is now no longer needed so the rebase just involved taking my version of each conflict and removing the initialisation of xenbranch_forqemu. Accordingly I've retained your Ack, I hope that is ok. We discussed on IRC with you and Stefano and are going to aim to push this in the w/c 19 October. Cheers, Ian. -----------8<------- From faa826a104a1e6c7e357870a843777887b55a3ef Mon Sep 17 00:00:00 2001 From: Ian Campbell <ian.campbell@xxxxxxxxxx> Date: Thu, 30 Jul 2015 13:42:03 +0100 Subject: [PATCH v2] Switch to merged qemu-xen{,-traditional}.git trees The qemu-mainline flights now push to the upstream-tested branch of qemu-xen.git (while still pulling from upstream). The qemu-upstream-unstable flights pull from staging and push to master in qemu-xen.git All of the qemu-upstream-X.Y-testing pull from staging-X.Y and push to stable-X.Y branch in qemu-xen.git. For now we also continue pushing to the old trees for qemu-upstream 4.2 through to 4.6-testing. Once those branches have updated their Config.mk and done a point release we can consider removing these. Abolish $LOCALREV_QEMU_MAINLINE in favour of $LOCALREV_QEMU_UPSTREAM, it was used inconsistently. While changing things ensure all pushes are done to refs/heads/$thing to avoid issues when output branches to not exist. Note that xenbranch_forqemu is no longer needed. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> --- v2: Use branchcore for old tree pushes. --- ap-common | 12 +++--------- ap-fetch-version | 10 ++++++++-- ap-fetch-version-old | 14 +++++++++----- ap-push | 23 +++++++++++++++++++---- 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/ap-common b/ap-common index 91425a9..2cba7f8 100644 --- a/ap-common +++ b/ap-common @@ -19,8 +19,6 @@ # $xenbranch must already be set -xenbranch_forqemu=${xenbranch/xen-unstable-smoke/xen-unstable} - : ${XENBITS:=osstest@xxxxxxxxxxxxxxx} : ${TREEBRANCH_OSSTEST_UPSTREAM=`getconfig OsstestUpstream`} @@ -28,9 +26,7 @@ xenbranch_forqemu=${xenbranch/xen-unstable-smoke/xen-unstable} : ${TREE_XEN:=git://xenbits.xen.org/xen.git} : ${PUSH_TREE_XEN:=$XENBITS:/home/xen/git/xen.git} -#: ${TREE_QEMU:=git://mariner.uk.xensource.com/qemu-$xenbranch_forqemu.git} -: ${TREE_QEMU:=git://xenbits.xen.org/staging/qemu-$xenbranch_forqemu.git} - +: ${TREE_QEMU:=git://xenbits.xen.org/qemu-xen-traditional.git} : ${GIT_KERNEL_ORG:=git://git.kernel.org} : ${KERNEL_SCM:=${GIT_KERNEL_ORG}/pub/scm/linux/kernel/git} @@ -89,13 +85,11 @@ fi : ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27} -: ${TREE_QEMU_UPSTREAM:=git://xenbits.xen.org/staging/qemu-upstream-${xenbranch_forqemu#xen-}.git} +: ${TREE_QEMU_UPSTREAM:=git://xenbits.xen.org/qemu-xen.git} +: ${PUSH_TREE_QEMU_UPSTREAM=$XENBITS:/home/xen/git/qemu-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} -: ${PUSH_TREE_QEMU_MAINLINE:=$XENBITS:/home/xen/git/osstest/qemu.git} -: ${LOCALREV_QEMU_MAINLINE:=daily-cron.$branch} info_linux_tree () { case $1 in diff --git a/ap-fetch-version b/ap-fetch-version index 6fa7588..973c30e 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -55,9 +55,15 @@ qemu-mainline) repo_tree_rev_fetch_git $branch \ $TREE_QEMU_MAINLINE master $LOCALREV_QEMU_UPSTREAM ;; -qemu-upstream-*) +qemu-upstream-unstable) repo_tree_rev_fetch_git $branch \ - $TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM + $TREE_QEMU_UPSTREAM staging $LOCALREV_QEMU_UPSTREAM + ;; +qemu-upstream-*-testing) + branchcore=${branch#qemu-upstream-} + branchcore=${branchcore%-testing} + repo_tree_rev_fetch_git $branch \ + $TREE_QEMU_UPSTREAM staging-$branchcore $LOCALREV_QEMU_UPSTREAM ;; linux) repo_tree_rev_fetch_git linux \ diff --git a/ap-fetch-version-old b/ap-fetch-version-old index 66d51f8..511c1fc 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -32,8 +32,6 @@ select_xenbranch : ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old} : ${BASE_LOCALREV_OVMF:=daily-cron.$branch.old} -: ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}} - if info_linux_tree "$branch"; then repo_tree_rev_fetch_git linux \ $BASE_TREE_LINUX_THIS $BASE_TAG_LINUX_THIS $BASE_LOCALREV_LINUX @@ -61,11 +59,17 @@ xen-4.*-testing) ;; qemu-mainline) repo_tree_rev_fetch_git $branch \ - $BASE_TREE_QEMU_MAINLINE mainline/xen-tested-master $LOCALREV_QEMU_MAINLINE + $TREE_QEMU_UPSTREAM upstream-tested $LOCALREV_QEMU_UPSTREAM + ;; +qemu-upstream-unstable) + repo_tree_rev_fetch_git $branch \ + $TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM ;; -qemu-upstream-*) +qemu-upstream-*-testing) + branchcore=${branch#qemu-upstream-} + branchcore=${branchcore%-testing} repo_tree_rev_fetch_git $branch \ - $BASE_TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM + $TREE_QEMU_UPSTREAM stable-$branchcore $LOCALREV_QEMU_UPSTREAM ;; linux) repo_tree_rev_fetch_git linux \ diff --git a/ap-push b/ap-push index d2195f2..eacf96b 100755 --- a/ap-push +++ b/ap-push @@ -30,8 +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_QEMU_UPSTREAM=$PUSH_TREE_QEMU_UPSTREAM TREE_XEN=$PUSH_TREE_XEN TREE_LIBVIRT=$PUSH_TREE_LIBVIRT TREE_RUMPUSERXEN=$PUSH_TREE_RUMPUSERXEN @@ -67,12 +66,28 @@ xen-*-testing) ;; qemu-mainline) cd $repos/qemu-mainline - git push $TREE_QEMU_MAINLINE $revision:refs/heads/mainline/xen-tested-master + git push $TREE_QEMU_UPSTREAM $revision:refs/heads/upstream-tested ;; -qemu-upstream-*) +qemu-upstream-unstable) cd $repos/$branch git push $TREE_QEMU_UPSTREAM $revision:refs/heads/master ;; +qemu-upstream-*-testing) + branchcore=${branch#qemu-upstream-} + branchcore=${branchcore%-testing} + cd $repos/$branch + git push $TREE_QEMU_UPSTREAM $revision:refs/heads/stable-$branchcore + + # For now also push to the old split trees for historical + # branches only (qemu-upstream started with xen-4.2-testing + # and the split trees end at xen-4.6-testing) + case "$branchcore" in + 4.[23456]) + tree=$XENBITS:/home/xen/git/qemu-upstream-${branchcore}-testing.git + git push $tree $revision:refs/heads/master + ;; + esac + ;; linux-3.*) cd $repos/linux git push $TREE_LINUX $revision:refs/heads/tested/$branch -- 2.5.3 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.