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

Message ID 1392122520-5453-2-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell Feb. 11, 2014, 12:42 p.m.
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@citrix.com>
---
Applied on top of a revert of a528b10cd6a552e92ed2b1b809c991a421ebdba6.
---
 cr-daily-branch | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Ian Campbell Feb. 11, 2014, 3:11 p.m. | #1
On Tue, 2014-02-11 at 15:06 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST 2/2] cr-daily-branch: make sure we test the correct tree for Linux branches"):
> > 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@citrix.com>
> > ---
> > Applied on top of a revert of a528b10cd6a552e92ed2b1b809c991a421ebdba6.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Thanks. I rewound pretest from a528b and stuck this on top as discussed.

Ian.

Patch

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