[linux-linus test] 24817: regressions - FAIL

[linux-linus test] 24817: regressions - FAIL

[xen.org]

flight 24817 linux-linus real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/24817/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-amd64-i386-pair   17 guest-migrate/src_host/dst_host fail REGR. vs. 12557

Regressions which are regarded as allowable (not blocking):
 test-amd64-amd64-xl-qemuu-winxpsp3  7 windows-install          fail like 12557

Tests which did not succeed, but are not blocking:
 test-armhf-armhf-xl           1 xen-build-check(1)           blocked  n/a
 build-armhf-pvops             4 kernel-build                 fail   never pass
 test-amd64-amd64-xl-pcipt-intel  9 guest-start                 fail never pass
 test-amd64-i386-xl-qemuu-win7-amd64 13 guest-stop              fail never pass
 test-amd64-i386-xl-win7-amd64 13 guest-stop                   fail  never pass
 test-amd64-amd64-xl-qemut-win7-amd64 13 guest-stop             fail never pass
 test-amd64-amd64-xl-win7-amd64 13 guest-stop                   fail never pass
 test-amd64-amd64-xl-qemuu-win7-amd64 13 guest-stop             fail never pass
 test-amd64-i386-xend-qemut-winxpsp3 16 leak-check/check        fail never pass
 test-amd64-amd64-xl-qemut-winxpsp3 13 guest-stop               fail never pass
 test-amd64-i386-xl-qemut-winxpsp3-vcpus1 13 guest-stop         fail never pass
 test-amd64-i386-xend-winxpsp3 16 leak-check/check             fail  never pass
 test-amd64-amd64-xl-winxpsp3 13 guest-stop                   fail   never pass
 test-amd64-i386-xl-qemut-win7-amd64 13 guest-stop              fail never pass
 test-amd64-i386-xl-qemuu-winxpsp3-vcpus1 13 guest-stop         fail never pass
 test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop               fail never pass

version targeted for testing:
 linux                494479038d97f1b9f76fc633a360a681acdf035c
baseline version:
 linux                c16fa4f2ad19908a47c63d8fa436a1178438c7e7

------------------------------------------------------------
7013 people touched revisions under test,
not listing them all
------------------------------------------------------------

jobs:
 build-amd64-xend                                             pass    
 build-i386-xend                                              pass    
 build-amd64                                                  pass    
 build-armhf                                                  pass    
 build-i386                                                   pass    
 build-amd64-pvops                                            pass    
 build-armhf-pvops                                            fail    
 build-i386-pvops                                             pass    
 test-amd64-amd64-xl                                          pass    
 test-armhf-armhf-xl                                          blocked 
 test-amd64-i386-xl                                           pass    
 test-amd64-i386-rhel6hvm-amd                                 pass    
 test-amd64-i386-qemut-rhel6hvm-amd                           pass    
 test-amd64-i386-qemuu-rhel6hvm-amd                           pass    
 test-amd64-i386-freebsd10-amd64                              pass    
 test-amd64-amd64-xl-qemut-win7-amd64                         fail    
 test-amd64-i386-xl-qemut-win7-amd64                          fail    
 test-amd64-amd64-xl-qemuu-win7-amd64                         fail    
 test-amd64-i386-xl-qemuu-win7-amd64                          fail    
 test-amd64-amd64-xl-win7-amd64                               fail    
 test-amd64-i386-xl-win7-amd64                                fail    
 test-amd64-i386-xl-credit2                                   pass    
 test-amd64-i386-freebsd10-i386                               pass    
 test-amd64-amd64-xl-pcipt-intel                              fail    
 test-amd64-i386-rhel6hvm-intel                               pass    
 test-amd64-i386-qemut-rhel6hvm-intel                         pass    
 test-amd64-i386-qemuu-rhel6hvm-intel                         pass    
 test-amd64-i386-xl-multivcpu                                 pass    
 test-amd64-amd64-pair                                        pass    
 test-amd64-i386-pair                                         fail    
 test-amd64-amd64-xl-sedf-pin                                 pass    
 test-amd64-amd64-pv                                          pass    
 test-amd64-i386-pv                                           pass    
 test-amd64-amd64-xl-sedf                                     pass    
 test-amd64-i386-xl-qemut-winxpsp3-vcpus1                     fail    
 test-amd64-i386-xl-qemuu-winxpsp3-vcpus1                     fail    
 test-amd64-i386-xl-winxpsp3-vcpus1                           fail    
 test-amd64-i386-xend-qemut-winxpsp3                          fail    
 test-amd64-amd64-xl-qemut-winxpsp3                           fail    
 test-amd64-amd64-xl-qemuu-winxpsp3                           fail    
 test-amd64-i386-xend-winxpsp3                                fail    
 test-amd64-amd64-xl-winxpsp3                                 fail    


------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images

Logs, config files, etc. are available at
    http://www.chiark.greenend.org.uk/~xensrcts/logs

Test harness code can be found at
    http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary


Not pushing.

(No revision log; it would be 2370853 lines long.)

[PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Ian Campbell]

On Sun, 2014-02-09 at 16:04 +0000, xen.org wrote:
> 
>  build-armhf-pvops             4 kernel-build                 fail   never pass 

+ git checkout 494479038d97f1b9f76fc633a360a681acdf035c
fatal: reference is not a tree: 494479038d97f1b9f76fc633a360a681acdf035c

This is because it is using git://xenbits.xen.org/linux-pvops.git
instead of the tree it should be testing...

The following fixes it for me, but although the results are as I wanted
I'm not 100% sure about this override in the first place. In my
experiments with cr-daily-branch I see:

        Branch		$TREE_LINUX		$TREE_LINUX_ARM
        
        xen-unstable	pvops			pvops
        linux-linus	torvalds		pvops
        linux-arm-xen	arm-xen			arm-xen

        Key:
        [arm-xen] git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen.git
        [torvalds] git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
        [pvops] git://xenbits.xen.org/linux-pvops.git
        
IOW $TREE_LINUX is always correct.

When invoking make-flight directly both are always "pvops".

8<---------------------------------------

>From 344b0ca5e623d8212ee9d5452f19aba2df2c97fe Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 10 Feb 2014 09:33:00 +0000
Subject: [PATCH] mfi-common: Only override the pvops kernel repo for
 linux-arm-xen branch

Otherwise e.g. linux-linus tries to use the wrong tree and fails.

I have confirmed that for flights on xen-unstable, linux-linus and
linux-arm-xen the only difference in the runvars is
linux-linux.build-armhf-pvops.tree_linus which changes from
git://xenbits.xen.org/linux-pvops.git to
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git as
expected.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 mfi-common | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/mfi-common b/mfi-common
index 8f56092..f7f981e 100644
--- a/mfi-common
+++ b/mfi-common
@@ -44,6 +44,11 @@ create_build_jobs () {
 
     if [ "x$arch" = xdisable ]; then continue; fi
 
+    pvops_kernel="
+      tree_linux=$TREE_LINUX
+      revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
+    "
+
     case "$arch" in
     armhf)
       case "$branch" in
@@ -59,10 +64,13 @@ create_build_jobs () {
       xen-4.1-testing) continue;;
       xen-4.2-testing) continue;;
       esac
-      pvops_kernel="
-        tree_linux=$TREE_LINUX_ARM
-        revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
-      "
+
+      if [ "$branch" = "linux-arm-xen" ]; then
+        pvops_kernel="
+          tree_linux=$TREE_LINUX_ARM
+          revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
+        "
+      fi
       pvops_kconfig_overrides="
         kconfig_override_y=CONFIG_EXT4_FS
       "
@@ -71,10 +79,6 @@ create_build_jobs () {
       case "$branch" in
       linux-arm-xen) continue;;
       esac
-      pvops_kernel="
-        tree_linux=$TREE_LINUX
-        revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
-      "
       ;;
     esac
 
-- 
1.8.5.2

Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Pasi Kärkkäinen]

On Mon, Feb 10, 2014 at 10:37:13AM +0000, Ian Campbell wrote:
> On Sun, 2014-02-09 at 16:04 +0000, xen.org wrote:
> > 
> >  build-armhf-pvops             4 kernel-build                 fail   never pass 
> 
> + git checkout 494479038d97f1b9f76fc633a360a681acdf035c
> fatal: reference is not a tree: 494479038d97f1b9f76fc633a360a681acdf035c
> 
> This is because it is using git://xenbits.xen.org/linux-pvops.git
> instead of the tree it should be testing...
> 
> The following fixes it for me, but although the results are as I wanted
> I'm not 100% sure about this override in the first place. In my
> experiments with cr-daily-branch I see:
> 
>         Branch		$TREE_LINUX		$TREE_LINUX_ARM
>         
>         xen-unstable	pvops			pvops
>         linux-linus	torvalds		pvops
>         linux-arm-xen	arm-xen			arm-xen
> 
>         Key:
>         [arm-xen] git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen.git
>         [torvalds] git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Isn't that the "old" repo (but a symlink to the new one)? The new one being:
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

-- Pasi

[PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [Xen-devel] [linux-linus test] 24817: regressions - FAIL)"):
> On Sun, 2014-02-09 at 16:04 +0000, xen.org wrote:
> > 
> >  build-armhf-pvops             4 kernel-build                 fail   never pass 

Surely this is correct.  Linus's tip doesn't pass this test.

> + git checkout 494479038d97f1b9f76fc633a360a681acdf035c
> fatal: reference is not a tree: 494479038d97f1b9f76fc633a360a681acdf035c
> 
> This is because it is using git://xenbits.xen.org/linux-pvops.git
> instead of the tree it should be testing...

That's exactly what it should be using, isn't it ?  After all, in
principle, eventually, Linus's tip should work.  In the meantime it
doesn't and this is a real bug.

Ian.

Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Ian Campbell]

On Mon, 2014-02-10 at 11:51 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [Xen-devel] [linux-linus test] 24817: regressions - FAIL)"):
> > On Sun, 2014-02-09 at 16:04 +0000, xen.org wrote:
> > > 
> > >  build-armhf-pvops             4 kernel-build                 fail   never pass 
> 
> Surely this is correct.  Linus's tip doesn't pass this test.
> 
> > + git checkout 494479038d97f1b9f76fc633a360a681acdf035c
> > fatal: reference is not a tree: 494479038d97f1b9f76fc633a360a681acdf035c
> > 
> > This is because it is using git://xenbits.xen.org/linux-pvops.git
> > instead of the tree it should be testing...
> 
> That's exactly what it should be using, isn't it ?  After all, in
> principle, eventually, Linus's tip should work.  In the meantime it
> doesn't and this is a real bug.

Linus' tip is git.kernel.org/...torvalds/xen.git. This linux-pvops.git
tree contains the output of this pushgate.

The error is that it appears to be looking in the output tree for the
new revision, which obviously only exists in the input tree.

Ian.

Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Ian Campbell]

On Mon, 2014-02-10 at 13:48 +0200, Pasi Kärkkäinen wrote:
> On Mon, Feb 10, 2014 at 10:37:13AM +0000, Ian Campbell wrote:
> > On Sun, 2014-02-09 at 16:04 +0000, xen.org wrote:
> > > 
> > >  build-armhf-pvops             4 kernel-build                 fail   never pass 
> > 
> > + git checkout 494479038d97f1b9f76fc633a360a681acdf035c
> > fatal: reference is not a tree: 494479038d97f1b9f76fc633a360a681acdf035c
> > 
> > This is because it is using git://xenbits.xen.org/linux-pvops.git
> > instead of the tree it should be testing...
> > 
> > The following fixes it for me, but although the results are as I wanted
> > I'm not 100% sure about this override in the first place. In my
> > experiments with cr-daily-branch I see:
> > 
> >         Branch		$TREE_LINUX		$TREE_LINUX_ARM
> >         
> >         xen-unstable	pvops			pvops
> >         linux-linus	torvalds		pvops
> >         linux-arm-xen	arm-xen			arm-xen
> > 
> >         Key:
> >         [arm-xen] git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen.git
> >         [torvalds] git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 
> Isn't that the "old" repo (but a symlink to the new one)? The new one being:
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> 

Presumably. I don't think it really matters here though.



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

Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [Xen-devel] [linux-linus test] 24817: regressions - FAIL)"):
> Linus' tip is git.kernel.org/...torvalds/xen.git. This linux-pvops.git
> tree contains the output of this pushgate.
> 
> The error is that it appears to be looking in the output tree for the
> new revision, which obviously only exists in the input tree.

Oh, I see, yes.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Unless you have more bugfixes in the pipeline, you should probably
push that right away so that it doesn't get entangled with the
forthcoming change to use FreeBSD RELEASE instead (as prompted by
Roger).

Thanks,
Ian.

Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Ian Campbell]

On Mon, 2014-02-10 at 12:05 +0000, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [Xen-devel] [linux-linus test] 24817: regressions - FAIL)"):
> > Linus' tip is git.kernel.org/...torvalds/xen.git. This linux-pvops.git
> > tree contains the output of this pushgate.
> > 
> > The error is that it appears to be looking in the output tree for the
> > new revision, which obviously only exists in the input tree.
> 
> Oh, I see, yes.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> Unless you have more bugfixes in the pipeline, you should probably
> push that right away so that it doesn't get entangled with the
> forthcoming change to use FreeBSD RELEASE instead (as prompted by
> Roger).

I don't have anything else pending[0], but I'm about to borrow one of
the marilith machines and do some local manual runs to get a quicker
turnaround on this stuff. I wouldn't expect that to result in any
patches before tomorrow though.

Ian.

[0] actually not quite true, I have a bunch of older minor patches:
        [PATCH OSSTEST] README: Add some core concepts and terminology
        [PATCH OSSTEST] standalone: add blessing to flights table.
        [PATCH OSSTEST] cri-args-hostlists: Allow environment to control OSSTEST_CONFIG

But these aren't urgent or tied up in anything else.

Ian.

Re: [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL)

[Ian Campbell]

On Mon, 2014-02-10 at 10:37 +0000, Ian Campbell wrote:
> The following fixes it for me, but although the results are as I wanted
> I'm not 100% sure about this override in the first place. In my
> experiments with cr-daily-branch I see:

But I didn't consider {DEFAULT_}REVISION_LINUX{_ARM} and how it
interacts:

        Branch		$TREE_LINUX#$REVISION_LINUX	$TREE_LINUX_ARM#$R_L_ARM
        xen-unstable	pvops#tested/linux-3.4		pvops#tested/linux-arm-xen
        linux-linus	torvalds#master			pvops#XXX
        linux-arm-xen	stefano#master			stefano#master
        osstest		pvops#tested/linux-3.4		pvops#tested/linux-arm-xen

pvops#XXX == the revision from torvalds#master, but with the pvops tree
i.e. the brokeness I started out trying to fix.

What this means is that osstest's own push gate is currently blocked
because it is trying to test using the standard tree on armhf -- which
is a 3.4 tree and has no support for any of the stuff we need. I suspect
xen-unstable would also be broken by this (so its good the push gate
caught it).

One way (to bodge?) around this would be to use $R_L on any branch
matching linux-* *except* linux-arm-xen and for anything else to use
$R_L_A for (on armhf only of course). This has the affect (I hope) of
using the right branch for gating trees like linux-linus and
linux-arm-xen but continuing to use the correct tested branch for the
arch.

But I can't help thinking that this should perhaps be solved further up
by e.g. making $TREE_LINUX_ARM#$REVISION_LINUX_ARM be correct for
linux-linus -- i.e. by making some change in ap-common:info_linux_tree.

I'm not sure what that would look like though -- it might be easiest to
thrash this stuff out f2f later.

In the meantime here something which I think might fix mfi-common as I
described 3 paras ago...

Ian.

diff --git a/mfi-common b/mfi-common
index f7f981e..6ec164e 100644
--- a/mfi-common
+++ b/mfi-common
@@ -44,10 +44,19 @@ create_build_jobs () {
 
     if [ "x$arch" = xdisable ]; then continue; fi
 
+    if [ "x$arch" = "xarmhf" ] ; then
+      echo LINUX $TREE_LINUX \"${REVISION_LINUX}\" \"${DEFAULT_REVISION_LINUX}\" >&2
+      echo ARM $TREE_LINUX_ARM \"${REVISION_LINUX_ARM}\" \"${DEFAULT_REVISION_LINUX_ARM}\" >&2
+    fi
+
     pvops_kernel="
       tree_linux=$TREE_LINUX
       revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
     "
+    pvops_kernel_arm="
+      tree_linux=$TREE_LINUX_ARM
+      revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
+    "
 
     case "$arch" in
     armhf)
@@ -65,12 +74,12 @@ create_build_jobs () {
       xen-4.2-testing) continue;;
       esac
 
-      if [ "$branch" = "linux-arm-xen" ]; then
-        pvops_kernel="
-          tree_linux=$TREE_LINUX_ARM
-          revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
-        "
-      fi
+      case $branch in
+      linux-arm-xen) pvops_kernel="$pvops_kernel_arm" ;;
+      linux-*) ;; # Apart from linux-arm-xen these should test mainline kernels
+      *) pvops_kernel="$pvops_kernel_arm" ;;
+      esac
+
       pvops_kconfig_overrides="
         kconfig_override_y=CONFIG_EXT4_FS
       "

[PATCH OSSTEST 0/2] fix tree and revision selection for linux branches under armhf

[Ian Campbell]

On Tue, 2014-02-11 at 11:13 +0000, Ian Campbell wrote:
> But I can't help thinking that this should perhaps be solved further up
> by e.g. making $TREE_LINUX_ARM#$REVISION_LINUX_ARM be correct for
> linux-linus -- i.e. by making some change in ap-common:info_linux_tree.
> 
> I'm not sure what that would look like though -- it might be easiest to
> thrash this stuff out f2f later.

Which is what we did. 2 patches will follow, the first to revert the
incorrect change, the second to introduce the proper fix.

Ian -- it seems that osstest.git#pretest is in a state where I could
rewind instead of reverting the first change -- which do you prefer
under the circumstances?

Ian.

[PATCH OSSTEST 1/2] Revert "mfi-common: Only override the pvops kernel repo for linux-arm-xen branch"

[Ian Campbell]

This reverts commit a528b10cd6a552e92ed2b1b809c991a421ebdba6.

Fixing this in make-flight was incorrect -- make-flight should do as it was
told and use the appropriate TREE_LINUX(_ARCH) and REVISION_LINUX(_ARCH)
values it is given.

The real issue here was that these inputs were bogus for the linux-linus tree
when running on armhf and this will be fixed in a followup patch.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 mfi-common | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/mfi-common b/mfi-common
index f7f981e..8f56092 100644
--- a/mfi-common
+++ b/mfi-common
@@ -44,11 +44,6 @@ create_build_jobs () {
 
     if [ "x$arch" = xdisable ]; then continue; fi
 
-    pvops_kernel="
-      tree_linux=$TREE_LINUX
-      revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
-    "
-
     case "$arch" in
     armhf)
       case "$branch" in
@@ -64,13 +59,10 @@ create_build_jobs () {
       xen-4.1-testing) continue;;
       xen-4.2-testing) continue;;
       esac
-
-      if [ "$branch" = "linux-arm-xen" ]; then
-        pvops_kernel="
-          tree_linux=$TREE_LINUX_ARM
-          revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
-        "
-      fi
+      pvops_kernel="
+        tree_linux=$TREE_LINUX_ARM
+        revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
+      "
       pvops_kconfig_overrides="
         kconfig_override_y=CONFIG_EXT4_FS
       "
@@ -79,6 +71,10 @@ create_build_jobs () {
       case "$branch" in
       linux-arm-xen) continue;;
       esac
+      pvops_kernel="
+        tree_linux=$TREE_LINUX
+        revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
+      "
       ;;
     esac
 
-- 
1.8.5.2

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

[Ian Campbell]

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(+)

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

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

[Ian Jackson]

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>

Ian.

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

[Ian Campbell]

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.