ap-*: use linux 3.10.y stable branch by default

Also: no longer test "linux" branch (Jeremy's tree)

diff --git a/ap-common b/ap-common
index d7d6e59aa54ecaf2814cd6ae460a9e38c5a7ec83..dac9e5c712b57cc9183e177de93b0b8871d8c52a 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -32,10 +32,7 @@
 : ${KERNEL_SCM:=${GIT_KERNEL_ORG}/pub/scm/linux/kernel/git}
 
 : ${TREEVCS_LINUX:=git}
-: ${TREE_LINUX:=${KERNEL_SCM}/jeremy/xen.git}
-#: ${TREE_LINUX:=git://mariner.uk.xensource.com/linux-2.6-jeremy-temp.git}
-#: ${TREE_LINUX:=git://github.com/jsgf/linux-xen.git}
-: ${TAG_LINUX:=xen/next-2.6.32}
+: ${TREE_LINUX:=${KERNEL_SCM}/stable/linux-stable.git}
 
 : ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git}
 : ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git}
@@ -43,7 +40,7 @@
 
 : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git}
 : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git}
-: ${BASE_TAG_LINUX:=master}
+: ${BASE_TAG_LINUX:=tested/linux-3.10}
 
 : ${TREE_LINUX2639:=${KERNEL_SCM}/konrad/xen.git}
 : ${TAG_LINUX2639:=stable/2.6.39.x}
@@ -66,6 +63,10 @@ info_linux_tree () {
                : ${TREE_LINUX_THIS:=${KERNEL_SCM}/stable/linux-stable.git}
                : ${TAG_LINUX_THIS:=linux-3.0.y}
                ;;
+       linux-3.*)
+               : ${TREE_LINUX_THIS:=${KERNEL_SCM}/stable/linux-stable.git}
+               : ${TAG_LINUX_THIS:=$1.y}
+               ;;
        linux-mingo-tip-master)
                : ${TREE_LINUX_THIS:=${KERNEL_SCM}/tip/tip.git}
                : ${GITFORCEFLAG_TREE_LINUX_THIS:=-f}

diff --git a/ap-push b/ap-push
index 1c6522be9c48115b5f8ffb5690d5e3609ffccd93..dc0a16666eb5ac3282289d3e8fe3d8f95dbd52a8 100755 (executable)
--- a/ap-push
+++ b/ap-push
@@ -25,7 +25,6 @@ revision=$2
 . cri-common
 select_xenbranch
 
-: ${TAG_LINUX:=master}
 : ${TAG_LINUX2639:=tested/2.6.39.x}
 
 . ap-common
@@ -61,9 +60,9 @@ qemu-upstream-*)
        cd $repos/$branch
         git push $TREE_QEMU_UPSTREAM $revision:master
         ;;
-linux)
+linux-3.*)
        cd $repos/linux
-       git push $TREE_LINUX $revision:$TAG_LINUX
+       git push $TREE_LINUX $revision:tested/$branch
        ;;
 linux-2.6.39)
        cd $repos/linux

diff --git a/cr-for-branches b/cr-for-branches
index cdf768fe5366c9946df92c0aafc46e5c8ebcee16..b783be3f23d2cd53d0f112a054c6ee2192d61bf0 100755 (executable)
--- 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-unstable qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing linux ${EXTRA_BRANCHES}}
+: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-unstable qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing linux-3.10 ${EXTRA_BRANCHES}}
 export BRANCHES
 
 with-lock-ex -w data-tree-lock bash -ec '