From patchwork Mon Jan 18 14:28:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8055091 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D11B3BEEE5 for ; Mon, 18 Jan 2016 14:32:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE0F320430 for ; Mon, 18 Jan 2016 14:32:03 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1D0920382 for ; Mon, 18 Jan 2016 14:32:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aLAo9-0001ZH-Ix; Mon, 18 Jan 2016 14:29:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aLAo7-0001XB-IF for xen-devel@lists.xen.org; Mon, 18 Jan 2016 14:29:23 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id EA/EA-23366-3C6FC965; Mon, 18 Jan 2016 14:29:23 +0000 X-Env-Sender: prvs=818d0ce80=Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1453127359!17659173!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59542 invoked from network); 18 Jan 2016 14:29:22 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 18 Jan 2016 14:29:22 -0000 X-IronPort-AV: E=Sophos;i="5.22,312,1449532800"; d="scan'208";a="332157264" From: Ian Campbell To: , Date: Mon, 18 Jan 2016 14:28:50 +0000 Message-ID: <1453127337-16136-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1453127319.6020.156.camel@citrix.com> References: <1453127319.6020.156.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v2 05/12] mfi-common: Always add debian_suite to debian_runvars X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds an explicit debian_suite to some jobs which didn't already have one, meaning that those jobs will remain the same when cloned for a bisect and run in a tree where $c{DebianGuestSuite} has changed since the original construction. No expected semantic change. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v2: Replaces "make-*flight: Abolish $defsuite and $guestdefsuite", just always set debian_suite. @@ -444,13 +444,42 @@ xen-unstable test-amd64-amd64-xl-pvh-intel debian_pvh 1 xen-unstable test-amd64-amd64-amd64-pvgrub debian_suite jessie xen-unstable test-amd64-amd64-i386-pvgrub debian_suite jessie +xen-unstable test-amd64-amd64-libvirt debian_suite jessie +xen-unstable test-amd64-amd64-libvirt-pair debian_suite jessie xen-unstable test-amd64-amd64-libvirt-vhd debian_suite jessie +xen-unstable test-amd64-amd64-libvirt-xsm debian_suite jessie +xen-unstable test-amd64-amd64-migrupgrade debian_suite jessie +xen-unstable test-amd64-amd64-pair debian_suite jessie xen-unstable test-amd64-amd64-pygrub debian_suite jessie +xen-unstable test-amd64-amd64-xl debian_suite jessie +xen-unstable test-amd64-amd64-xl-credit2 debian_suite jessie +xen-unstable test-amd64-amd64-xl-multivcpu debian_suite jessie +xen-unstable test-amd64-amd64-xl-pvh-amd debian_suite jessie +xen-unstable test-amd64-amd64-xl-pvh-intel debian_suite jessie xen-unstable test-amd64-amd64-xl-qcow2 debian_suite jessie +xen-unstable test-amd64-amd64-xl-rtds debian_suite jessie +xen-unstable test-amd64-amd64-xl-xsm debian_suite jessie +xen-unstable test-amd64-i386-libvirt debian_suite jessie +xen-unstable test-amd64-i386-libvirt-pair debian_suite jessie +xen-unstable test-amd64-i386-libvirt-xsm debian_suite jessie +xen-unstable test-amd64-i386-migrupgrade debian_suite jessie +xen-unstable test-amd64-i386-pair debian_suite jessie +xen-unstable test-amd64-i386-xl debian_suite jessie xen-unstable test-amd64-i386-xl-raw debian_suite jessie +xen-unstable test-amd64-i386-xl-xsm debian_suite jessie +xen-unstable test-armhf-armhf-libvirt debian_suite jessie xen-unstable test-armhf-armhf-libvirt-qcow2 debian_suite jessie xen-unstable test-armhf-armhf-libvirt-raw debian_suite jessie +xen-unstable test-armhf-armhf-libvirt-xsm debian_suite jessie +xen-unstable test-armhf-armhf-xl debian_suite jessie +xen-unstable test-armhf-armhf-xl-arndale debian_suite jessie +xen-unstable test-armhf-armhf-xl-credit2 debian_suite jessie +xen-unstable test-armhf-armhf-xl-cubietruck debian_suite jessie +xen-unstable test-armhf-armhf-xl-midway debian_suite jessie +xen-unstable test-armhf-armhf-xl-multivcpu debian_suite jessie +xen-unstable test-armhf-armhf-xl-rtds debian_suite jessie xen-unstable test-armhf-armhf-xl-vhd debian_suite jessie +xen-unstable test-armhf-armhf-xl-xsm debian_suite jessie xen-unstable test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm debianhvm_image debian-8.2.0-amd64-CD-1.iso xen-unstable test-amd64-amd64-xl-qemut-debianhvm-amd64 debianhvm_image debian-8.2.0-amd64-CD-1.iso xen-unstable test-amd64-amd64-xl-qemut-debianhvm-amd64-xsm debianhvm_image debian-8.2.0-amd64-CD-1.iso --- mfi-common | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mfi-common b/mfi-common index 0e2b64f..1fcdb98 100644 --- a/mfi-common +++ b/mfi-common @@ -351,7 +351,7 @@ usual_debianhvm_image () { # Provides various convenience variables for the callback. # test_matrix_iterate () { - local hostos_runvars + local suite guestsuite hostos_runvars case "$xenbranch" in xen-3.*-testing) pairtoolstack=xend ;; @@ -431,10 +431,10 @@ test_matrix_iterate () { arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\" " - debian_runvars="debian_kernkind=$kernkind debian_arch=$dom0arch" - if [ $guestsuite != $defguestsuite ] ; then - debian_runvars="$debian_runvars debian_suite=$guestsuite" - fi + debian_runvars="debian_kernkind=$kernkind \ + debian_arch=$dom0arch \ + debian_suite=$guestsuite \ + " most_hostflags="arch-$dom0arch,arch-xen-$xenarch,suite-$suite,purpose-test" if [ "x$min_linux_hostflag" != "x" ] ; then