From patchwork Mon Jan 18 14:28:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8055031 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 52370BEEE5 for ; Mon, 18 Jan 2016 14:31:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7AE53203A9 for ; Mon, 18 Jan 2016 14:31:48 +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 5031020382 for ; Mon, 18 Jan 2016 14:31:44 +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 1aLAnv-0001S3-05; Mon, 18 Jan 2016 14:29:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aLAnu-0001Qx-51 for xen-devel@lists.xen.org; Mon, 18 Jan 2016 14:29:10 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 3B/70-31122-5B6FC965; Mon, 18 Jan 2016 14:29:09 +0000 X-Env-Sender: prvs=818d0ce80=Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1453127341!10833205!2 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 61431 invoked from network); 18 Jan 2016 14:29:09 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 18 Jan 2016 14:29:09 -0000 X-IronPort-AV: E=Sophos;i="5.22,312,1449532800"; d="scan'208";a="325889206" From: Ian Campbell To: , Date: Mon, 18 Jan 2016 14:28:54 +0000 Message-ID: <1453127337-16136-9-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: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v2 09/12] mfi-common: Set di_version 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 --- v2: s/diversion/di_version/ Moved to same model of setting $def... as used for the suites. Dropped ack due to change to $def... --- make-flight | 4 +++- mfi-common | 15 +++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/make-flight b/make-flight index e9cad0a..e0d9e0c 100755 --- a/make-flight +++ b/make-flight @@ -33,7 +33,9 @@ flight=`./cs-flight-create $blessing $branch` defsuite=`getconfig DebianSuite` defguestsuite=`getconfig GuestDebianSuite` -guest_di_version=`getconfig TftpDiVersion` +defdi_version=`getconfig TftpDiVersion` + +guest_di_version=$defdi_version case "$branch" in xen-unstable-smoke) diff --git a/mfi-common b/mfi-common index 1fcdb98..30c9d80 100644 --- a/mfi-common +++ b/mfi-common @@ -80,7 +80,7 @@ create_build_jobs () { local arch local pvops_kernel pvops_kconfig_overrides - local suite hostos_runvars + local suite di_version hostos_runvars local want_xend build_defxend build_extraxend local enable_ovmf local build_hostflags @@ -120,10 +120,10 @@ create_build_jobs () { esac case "$arch" in - *) suite=$defsuite;; + *) suite=$defsuite; di_version=$defdi_version;; esac - hostos_runvars="all_host_suite=$suite" + hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version" # 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 @@ -351,7 +351,7 @@ usual_debianhvm_image () { # Provides various convenience variables for the callback. # test_matrix_iterate () { - local suite guestsuite hostos_runvars + local suite guestsuite di_version hostos_runvars case "$xenbranch" in xen-3.*-testing) pairtoolstack=xend ;; @@ -402,10 +402,13 @@ test_matrix_iterate () { esac case "$xenarch" in - *) suite=$defsuite; guestsuite=$defguestsuite;; + *) suite=$defsuite + guestsuite=$defguestsuite + di_version=$defdi_version + ;; esac - hostos_runvars="all_host_suite=$suite" + hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version" for kern in ''; do