From patchwork Fri Jan 8 14:29:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 7986861 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 A8CBFBF0A9 for ; Fri, 8 Jan 2016 14:32:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8EAC20149 for ; Fri, 8 Jan 2016 14:32:57 +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 33DD0201EF for ; Fri, 8 Jan 2016 14:32:56 +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 1aHY3V-0004rS-G2; Fri, 08 Jan 2016 14:30:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHY3T-0004ou-0x for xen-devel@lists.xen.org; Fri, 08 Jan 2016 14:30:15 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 15/25-10715-6F7CF865; Fri, 08 Jan 2016 14:30:14 +0000 X-Env-Sender: prvs=80839a509=Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1452263405!13575267!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4314 invoked from network); 8 Jan 2016 14:30:13 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jan 2016 14:30:13 -0000 X-IronPort-AV: E=Sophos;i="5.20,538,1444694400"; d="scan'208";a="323696142" From: Ian Campbell To: , Date: Fri, 8 Jan 2016 14:29:56 +0000 Message-ID: <1452263399-14094-9-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1452263368.29416.39.camel@citrix.com> References: <1452263368.29416.39.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH RFC OSSTEST v1 09/12] mfi-common: Set diversion for build & test host install 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 means that bisections will use the same version, even if production-config changed in the mean time. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- mfi-common | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mfi-common b/mfi-common index 44e7b3e..c1c4ec5 100644 --- a/mfi-common +++ b/mfi-common @@ -123,7 +123,11 @@ create_build_jobs () { local suite=`getconfig DebianSuite` fi - hostos_runvars="all_host_suite=$suite" + if [ -z "$diversion" ] ; then + local diversion=`getconfig TftpDiVersion` + fi + + hostos_runvars="all_host_suite=$suite all_host_diversion=$diversion" # 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 @@ -408,7 +412,11 @@ test_matrix_iterate () { local guestsuite=`getconfig GuestDebianSuite` fi - hostos_runvars="all_host_suite=$suite" + if [ -z "$diversion" ] ; then + local diversion=`getconfig TftpDiVersion` + fi + + hostos_runvars="all_host_suite=$suite all_host_diversion=$diversion" for kern in ''; do