From patchwork Wed Mar 12 16:47:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 26153 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A6D94203AB for ; Wed, 12 Mar 2014 16:49:37 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf40691049oag.4 for ; Wed, 12 Mar 2014 09:49:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=LWXmb3jrANEYQvgofoOUxTfgzMW9e05tKT9EgfocNoM=; b=eN4B30TIRRp/Hlcrm6TxxeuEhy2L7SEF4LCqqtpf4uezpK9YngCmItsBQQ2wo9XSCt DC5Rt/abAkvaeUW0qIDqjSnubo+5kKp2eKV2tKgIL5C7R7Fwd3s5A+ra0HdtWC4rm6Ni HKRVAMghr/mylyrqtLmNz88znl7/897ijiDDyU3a32gBEmQidzMkF6ponkmG5yBSfwjf ndcFqeIaCyqcSlOLggruNXZEfDnAeUozhCoeGH2eGUCovGUdi7kiVhsbg4Q/6cMoDAiN z1Qy0d1z4/z4Oq7irLsTChBpPVmM03VwYHI7E/36RjWAz67sKmGVYMCkBa1xiwmcS/qg 8GrA== X-Gm-Message-State: ALoCoQmGsT6UK2xZ3mAl7W/Up83V6nit1H1TNKSIRlL6g+nS4UAU0seWb6f68+9EbCm+eFXahnwK X-Received: by 10.43.92.73 with SMTP id bp9mr17939921icc.26.1394642977190; Wed, 12 Mar 2014 09:49:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.225 with SMTP id r88ls3264133qgr.2.gmail; Wed, 12 Mar 2014 09:49:36 -0700 (PDT) X-Received: by 10.58.248.228 with SMTP id yp4mr860006vec.35.1394642976905; Wed, 12 Mar 2014 09:49:36 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id u5si7647505vdo.108.2014.03.12.09.49.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:49:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id lh14so8466954vcb.34 for ; Wed, 12 Mar 2014 09:49:36 -0700 (PDT) X-Received: by 10.52.240.207 with SMTP id wc15mr5403438vdc.14.1394642976718; Wed, 12 Mar 2014 09:49:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp303732vck; Wed, 12 Mar 2014 09:49:36 -0700 (PDT) X-Received: by 10.221.22.71 with SMTP id qv7mr864268vcb.34.1394642976401; Wed, 12 Mar 2014 09:49:36 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id xb4si3970054vdc.155.2014.03.12.09.49.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:49:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNmJx-0003Qk-Th; Wed, 12 Mar 2014 16:47:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNmJw-0003QU-Pt for xen-devel@lists.xen.org; Wed, 12 Mar 2014 16:47:56 +0000 Received: from [85.158.143.35:23255] by server-2.bemta-4.messagelabs.com id 78/C8-06539-BBF80235; Wed, 12 Mar 2014 16:47:55 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1394642872!929261!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12801 invoked from network); 12 Mar 2014 16:47:54 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Mar 2014 16:47:54 -0000 X-IronPort-AV: E=Sophos;i="4.97,639,1389744000"; d="scan'208";a="109237981" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 12 Mar 2014 16:47:45 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Wed, 12 Mar 2014 12:47:45 -0400 Received: from spare.cam.xci-test.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WNmJk-0007P9-S7; Wed, 12 Mar 2014 16:47:44 +0000 From: Ian Campbell To: Date: Wed, 12 Mar 2014 16:47:44 +0000 Message-ID: <1394642864-8306-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST] make-flight: only test xl in unstable X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: 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 Acked-by: Ian Jackson --- make-flight | 15 ++++++++++++++- mfi-common | 5 +++-- 2 files changed, 17 insertions(+), 3 deletions(-) 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