[Xen-devel] [PATCH OSSTEST 2/2] cr-daily-branch: make sure we test the correct tree for Linux branches

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

These branches should test the specific Linux tree which they and so should
not apply the per-arch overrides which are only intended to be used to pick up
an already verified tested Linux branch for use when testing some other
non-linux branch.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
Applied on top of a revert of a528b10cd6a552e92ed2b1b809c991a421ebdba6.
---
 cr-daily-branch | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cr-daily-branch b/cr-daily-branch
index 41ca796..02fef15 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -122,9 +122,16 @@ if [ "x$REVISION_LINUX" = x ]; then
         export REVISION_LINUX
 fi
 if [ "x$REVISION_LINUX_ARM" = x ]; then
+    if [ "x$tree" = "xlinux" ] ; then
+       TREE_LINUX_ARM=$TREE_LINUX
+       export TREE_LINUX_ARM
+       REVISION_LINUX_ARM=$REVISION_LINUX
+        export REVISION_LINUX_ARM
+    else
        determine_version REVISION_LINUX_ARM ${linuxbranch:-linux-arm-xen} \
                LINUX_ARM
         export REVISION_LINUX_ARM
+    fi
 fi
 if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
        determine_version REVISION_LINUXFIRMWARE linuxfirmware
-- 
1.8.5.2


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