[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [OSSTEST PATCH 02/14] Test Linux 4.1



The kernel.org stable git branch layout is the same for 4.1 as for
3.x, so simply extend the pattern, and add the branch to BRANCHES.

We move the linux-stable.git pattern to the end, and extend it to
linux-[3-9].[0-9]*, to provide a bit more future-proofing.  (There is
no particular reason other than shell glob convenience to stop at
linux-9.x.)

DEPLOYMENT NOTE: After this patch is acked, but just before it is
pushed to pretest, run (this version of)
  ./mg-branch-setup linux-4.1 bisect b953c0d234bc72e8489d3bf51a276c5c4ec85345
to create the working trees on the osstest VM and push the base of
v4.1 to the tested output branch.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
v2: Extend glob pattern in ap-common and move to the end.
---
 ap-common       |    8 ++++----
 cr-for-branches |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ap-common b/ap-common
index de7bb1d..7ddeb9a 100644
--- a/ap-common
+++ b/ap-common
@@ -116,10 +116,6 @@ info_linux_tree () {
                : ${TREE_LINUX_THIS:=git://kernel.ubuntu.com/ubuntu/linux.git}
                : ${TAG_LINUX_THIS:=$1.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}
@@ -129,6 +125,10 @@ info_linux_tree () {
                : ${TREE_LINUX_THIS:=${KERNEL_SCM}/next/linux-next.git}
                : ${GITFORCEFLAG_TREE_LINUX_THIS:=-f}
                ;;
+       linux-[3-9].[0-9]*)
+               : ${TREE_LINUX_THIS:=${KERNEL_SCM}/stable/linux-stable.git}
+               : ${TAG_LINUX_THIS:=$1.y}
+               ;;
 
        *)
                return 1
diff --git a/cr-for-branches b/cr-for-branches
index fd2b9c0..07650c1 100755
--- 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-4.4-testing xen-4.5-testing xen-unstable qemu-mainline 
qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing 
qemu-upstream-4.4-testing qemu-upstream-4.5-testing linux-3.18 linux-3.16 
linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf ${EXTRA_BRANCHES}}
+: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing 
xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-unstable qemu-mainline 
qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing 
qemu-upstream-4.4-testing qemu-upstream-4.5-testing linux-4.1 linux-3.18 
linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf 
${EXTRA_BRANCHES}}
 export BRANCHES
 
 fetchwlem=$wlem
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.