diff mbox

[Xen-devel] make-flight: drop another stray xend test from 4.5 onwards (Was: Re: [xen-unstable test] 25628: tolerable FAIL)

Message ID 1395662050.6294.2.camel@kazak.uk.xensource.com
State New
Headers show

Commit Message

Ian Campbell March 24, 2014, 11:54 a.m. UTC 
On Mon, 2014-03-24 at 08:08 +0000, xen.org wrote:
> Tests which did not succeed, but are not blocking:
[...]
>  test-amd64-amd64-pv           1 xen-build-check(1)           blocked  n/a
>  test-amd64-i386-pv            1 xen-build-check(1)           blocked  n/a

BROKEN: job 25628.build-amd64-xend not found (for path_dist); (25628.test-amd64-amd64-pv not marked broken) at Osstest/TestSupport.pm line 206.

Looks like I missed a reference to xend in 4e8b8c227544 "make-flight:
only test xl in unstable", not sure how...

Ian.

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

From e48c89585079f592c8c66f741819ddf6d85fc730 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 24 Mar 2014 11:50:11 +0000
Subject: [PATCH] make-flight: drop another stray xend test from 4.5 onwards

I believe this configuration is covered for xl by the existing
test-amd64-i386-xl so test-amd64-i386-pv is dropped rather than replaced.

Changes for xen-4.4-testing flights:
$ diff -ub <(./mg-show-flight-runvars before44) <(./mg-show-flight-runvars after44)
$

Changes to unstable flights:
$ diff -ub <(./mg-show-flight-runvars beforeunstable) <(./mg-show-flight-runvars afterunstable) | grep -E '^[-+]'
--- /dev/fd/63	2014-03-24 11:49:55.649082998 +0000
+++ /dev/fd/62	2014-03-24 11:49:55.649082998 +0000
-test-amd64-i386-pv                       all_hostflags             arch-i386,arch-xen-amd64,suite-wheezy,purpose-test
-test-amd64-i386-pv                       arch                      i386
-test-amd64-i386-pv                       buildjob                  build-i386-xend
-test-amd64-i386-pv                       debian_arch               i386
-test-amd64-i386-pv                       debian_kernkind           pvops
-test-amd64-i386-pv                       kernbuildjob              build-i386-pvops
-test-amd64-i386-pv                       kernkind                  pvops
-test-amd64-i386-pv                       toolstack                 xend
-test-amd64-i386-pv                       xenbuildjob               build-amd64-xend

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 make-flight | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

Comments

Ian Jackson April 2, 2014, 2:51 p.m. UTC | #1 
Ian Campbell writes ("[PATCH] make-flight: drop another stray xend test from 4.5 onwards (Was: Re: [Xen-devel] [xen-unstable test] 25628: tolerable FAIL)"):
> On Mon, 2014-03-24 at 08:08 +0000, xen.org wrote:
> > Tests which did not succeed, but are not blocking:
> [...]
> >  test-amd64-amd64-pv           1 xen-build-check(1)           blocked  n/a
> >  test-amd64-i386-pv            1 xen-build-check(1)           blocked  n/a
> 
> BROKEN: job 25628.build-amd64-xend not found (for path_dist); (25628.test-amd64-amd64-pv not marked broken) at Osstest/TestSupport.pm line 206.
> 
> Looks like I missed a reference to xend in 4e8b8c227544 "make-flight:
> only test xl in unstable", not sure how...

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

Will you push this ?

Thanks,
Ian.
Ian Campbell April 2, 2014, 2:55 p.m. UTC | #2 
On Wed, 2014-04-02 at 15:51 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH] make-flight: drop another stray xend test from 4.5 onwards (Was: Re: [Xen-devel] [xen-unstable test] 25628: tolerable FAIL)"):
> > On Mon, 2014-03-24 at 08:08 +0000, xen.org wrote:
> > > Tests which did not succeed, but are not blocking:
> > [...]
> > >  test-amd64-amd64-pv           1 xen-build-check(1)           blocked  n/a
> > >  test-amd64-i386-pv            1 xen-build-check(1)           blocked  n/a
> > 
> > BROKEN: job 25628.build-amd64-xend not found (for path_dist); (25628.test-amd64-amd64-pv not marked broken) at Osstest/TestSupport.pm line 206.
> > 
> > Looks like I missed a reference to xend in 4e8b8c227544 "make-flight:
> > only test xl in unstable", not sure how...
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> Will you push this ?

Yes.
Ian Campbell April 2, 2014, 3:04 p.m. UTC | #3 
On Wed, 2014-04-02 at 15:55 +0100, Ian Campbell wrote:
> On Wed, 2014-04-02 at 15:51 +0100, Ian Jackson wrote:
> > Ian Campbell writes ("[PATCH] make-flight: drop another stray xend test from 4.5 onwards (Was: Re: [Xen-devel] [xen-unstable test] 25628: tolerable FAIL)"):
> > > On Mon, 2014-03-24 at 08:08 +0000, xen.org wrote:
> > > > Tests which did not succeed, but are not blocking:
> > > [...]
> > > >  test-amd64-amd64-pv           1 xen-build-check(1)           blocked  n/a
> > > >  test-amd64-i386-pv            1 xen-build-check(1)           blocked  n/a
> > > 
> > > BROKEN: job 25628.build-amd64-xend not found (for path_dist); (25628.test-amd64-amd64-pv not marked broken) at Osstest/TestSupport.pm line 206.
> > > 
> > > Looks like I missed a reference to xend in 4e8b8c227544 "make-flight:
> > > only test xl in unstable", not sure how...
> > 
> > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> > 
> > Will you push this ?
> 
> Yes.

I added my own S-o-b in addition to your ack and pushed.

Thanks,
Ian.
diff mbox

Patch

diff --git a/make-flight b/make-flight
index 39fa7ba..8bfa1d9 100755
--- a/make-flight
+++ b/make-flight
@@ -126,16 +126,11 @@  do_hvm_winxp_tests () {
       continue
     fi
 
-    # No xend from 4.5 onwards
-    case "$xenbranch" in
-    xen-3.*-testing) toolstack= ;;
-    xen-4.0-testing) toolstack= ;;
-    xen-4.1-testing) toolstack= ;;
-    xen-4.2-testing) toolstack= ;;
-    xen-4.3-testing) toolstack= ;;
-    xen-4.4-testing) toolstack= ;;
-    *)               toolstack="xl" ;;
-    esac
+    if [ x$test_xend != xy ] ; then
+      toolstack="xl"
+    else
+      toolstack=
+    fi
 
     if [ x$toolstack = x ] ; then
       stripy toolstack xend xl \
@@ -237,8 +232,19 @@  test_matrix_do_one () {
       return
   fi
 
+  # xend tests for versions <= 4.4 only
+  case "$xenbranch" in
+  xen-3.*-testing) test_xend=y ;;
+  xen-4.0-testing) test_xend=y ;;
+  xen-4.1-testing) test_xend=y ;;
+  xen-4.2-testing) test_xend=y ;;
+  xen-4.3-testing) test_xend=y ;;
+  xen-4.4-testing) test_xend=y ;;
+  *)               test_xend=n ;;
+  esac
+
   # xend PV guest test on x86 only
-  if [ $dom0arch = "i386" -o $dom0arch = "amd64" ]; then
+  if [ x$test_xend = xy -a $dom0arch = "i386" -o $dom0arch = "amd64" ]; then
     job_create_test test-$xenarch$kern-$dom0arch-pv test-debian xend \
             $xenarch $dom0arch                                       \
             $debian_runvars all_hostflags=$most_hostflags