ap-push: push xen to git; push other trees to absolute paths on xenbits

diff --git a/ap-common b/ap-common
index b117ebafd863c54ecbb2f2dcbfe9aa3a68fc7ccb..31417b9fdd5996ef3809e1baf34de4fed6a22250 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -22,6 +22,7 @@
 : ${XENBITS:=osstest@xenbits.xensource.com}
 
 : ${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}
@@ -36,7 +37,7 @@
 #: ${TREE_LINUX:=git://github.com/jsgf/linux-xen.git}
 : ${TAG_LINUX:=xen/next-2.6.32}
 
-: ${PUSH_TREE_LINUX:=$XENBITS:git/linux-pvops.git}
+: ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git}
 : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git}
 : ${BASE_TAG_LINUX:=master}
 

diff --git a/ap-push b/ap-push
index df458cbda50a30f4140748cfc1e2199bebc0c4e7..054b05c75e1a6a531bb1618a007495099bb5e7f8 100755 (executable)
--- a/ap-push
+++ b/ap-push
@@ -32,6 +32,7 @@ select_xenbranch
 
 TREE_LINUX=$PUSH_TREE_LINUX
 TREE_QEMU_UPSTREAM=$XENBITS:git/qemu-upstream-${xenbranch#xen-}.git
+TREE_XEN=$PUSH_TREE_XEN
 
 if info_linux_tree "$branch"; then
        cd $repos/linux
@@ -41,9 +42,20 @@ if info_linux_tree "$branch"; then
 fi
 
 case "$branch" in
-xen*)
+xen-3.*)
        cd $repos/$branch.hg
-       hg push -r "$revision" ssh://$XENBITS/HG/$branch.hg
+       hg push -r "$revision" ssh://$XENBITS//home/xen/HG/$branch.hg
+       ;;
+xen-unstable)
+       cd $repos/xen
+       git push $TREE_XEN $revision:master
+       ;;
+xen-*-testing)
+       cd $repos/xen
+       xenversion=$branch
+       xenversion=${branch%-testing}
+       xenversion=${xenversion#xen-}
+       git push $TREE_XEN $revision:stable-$xenversion
        ;;
 qemu-upstream-*)
        cd $repos/$branch