| Message ID | 1394642864-8306-1-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | New |
| Headers | show |
Ian Campbell writes ("[PATCH OSSTEST] make-flight: only test xl in unstable"):
> xend has been deprecated for enough releases now, lets focus on xl and/or make
> space to add libvirt tests.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> I have verified that a xen-4.4-testing flight does not change, while a
> xen-unstable flight changes in the following expected ways:
> - build-.*-xend jobs are dropped
> - test-.*-xend-.* jobs become test-.*-xl-.*, the corresponding toolstack
> runvar changes to xl and the buildjob runvar loses its -xen suffix. This
> affects:
> - test-amd64-i386-xend-qemut-winxpsp3
> - test-amd64-i386-xend-winxpsp3
> - a new job test-amd64-i386-xl-qemuu-winxpsp3 is added, previously the
> non-sensical test-amd64-i386-xend-qemuu-winxpsp3 was suppressed by
> job_create_test_filter_callback.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Thanks for the test report.
Let's wait a while to see if anyone objects to the principle.
Ian.
On Wed, 2014-03-12 at 17:09 +0000, Ian Jackson wrote: > Ian Campbell writes ("[PATCH OSSTEST] make-flight: only test xl in unstable"): > > xend has been deprecated for enough releases now, lets focus on xl and/or make > > space to add libvirt tests. > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Applied, thanks.
diff --git a/make-flight b/make-flight index 033c3f0..39fa7ba 100755 --- a/make-flight +++ b/make-flight @@ -126,11 +126,24 @@ do_hvm_winxp_tests () { continue fi - stripy toolstack xend xl \ + # 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$toolstack = x ] ; then + stripy toolstack xend xl \ "$vcpus" 1 \ "$kern" '' \ "$xenarch" i386 \ "$dom0arch" i386 + fi toolstack_runvars="toolstack=$toolstack" diff --git a/mfi-common b/mfi-common index a95703d..3f40193 100644 --- a/mfi-common +++ b/mfi-common @@ -91,6 +91,7 @@ create_build_jobs () { # In 4.4 onwards xend is off by default. If necessary we build a # separate set of binaries with xend enabled in order to run those # tests which use xend. + # In 4.5 onwards we don't test xend anymore if [ -n "$WANT_XEND" ]; then want_xend=$WANT_XEND else @@ -106,8 +107,8 @@ create_build_jobs () { xen-4.1-testing) build_defxend=$want_xend; build_extraxend=false;; xen-4.2-testing) build_defxend=$want_xend; build_extraxend=false;; xen-4.3-testing) build_defxend=$want_xend; build_extraxend=false;; - *) build_defxend=false; - build_extraxend=$want_xend + xen-4.4-testing) build_defxend=false; build_extraxend=$want_xend;; + *) build_defxend=false; build_extraxend=false esac case "$xenbranch" in
xend has been deprecated for enough releases now, lets focus on xl and/or make space to add libvirt tests. I have verified that a xen-4.4-testing flight does not change, while a xen-unstable flight changes in the following expected ways: - build-.*-xend jobs are dropped - test-.*-xend-.* jobs become test-.*-xl-.*, the corresponding toolstack runvar changes to xl and the buildjob runvar loses its -xen suffix. This affects: - test-amd64-i386-xend-qemut-winxpsp3 - test-amd64-i386-xend-winxpsp3 - a new job test-amd64-i386-xl-qemuu-winxpsp3 is added, previously the non-sensical test-amd64-i386-xend-qemuu-winxpsp3 was suppressed by job_create_test_filter_callback. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- make-flight | 15 ++++++++++++++- mfi-common | 5 +++-- 2 files changed, 17 insertions(+), 3 deletions(-)