|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST] 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.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
ap-common | 10 +++-------
ap-fetch-version | 10 ++++++++--
ap-fetch-version-old | 14 +++++++++-----
ap-push | 25 ++++++++++++++++++++-----
4 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/ap-common b/ap-common
index dfeab9e..2cba7f8 100644
--- a/ap-common
+++ b/ap-common
@@ -26,9 +26,7 @@
: ${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.git}
-: ${TREE_QEMU:=git://xenbits.xen.org/staging/qemu-$xenbranch.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}
@@ -87,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#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 8b41acf..754a398 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -53,9 +53,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 0b4739b..464d1ab 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
@@ -59,11 +57,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 5967b42..c3bc814 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
@@ -63,11 +62,27 @@ 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:master
+ 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 "$xenbranch" in
+ xen-4.[23456]-testing)
+ tree=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git
+ git push $tree $revision:refs/heads/master
+ ;;
+ esac
;;
linux-3.*)
cd $repos/linux
--
2.5.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |