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@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ap-common b/ap-common
index 5b6e088f513021c5bd276a18d484cc626ff19cf5..059b4b2765d86a126a1cdad1351aa7887f3984a9 100644 (file)
--- 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@xenbits.xen.org}
 
 : ${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 f884bd37f7651d3664a6490e4ea264c7f05408de..a7b658bc1704f0842402c92edb8c8c51cc896c76 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -57,9 +57,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 99f276a48c1cefbe74f9f3f333111c203a5d84ff..ef079ba8eaae863279bf172f55d255ae51622868 100755 (executable)
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -34,8 +34,6 @@ check_ap_fetch_placeholders
 : ${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
@@ -63,11 +61,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 d2195f2118903abf4377d3325639a45cd2a394a8..eacf96bb45a7dc0c6ae394cb2cead856d2e07158 100755 (executable)
--- 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