From patchwork Mon Jan 18 14:28:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8055041 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 05B5F9F818 for ; Mon, 18 Jan 2016 14:31:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F0298203A9 for ; Mon, 18 Jan 2016 14:31:49 +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 10B3B203AB for ; Mon, 18 Jan 2016 14:31:49 +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 1aLAnx-0001TO-0v; Mon, 18 Jan 2016 14:29:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aLAnv-0001SO-K8 for xen-devel@lists.xen.org; Mon, 18 Jan 2016 14:29:11 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 30/1D-09708-6B6FC965; Mon, 18 Jan 2016 14:29:10 +0000 X-Env-Sender: prvs=818d0ce80=Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1453127341!10833205!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 61526 invoked from network); 18 Jan 2016 14:29:10 -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:10 -0000 X-IronPort-AV: E=Sophos;i="5.22,312,1449532800"; d="scan'208";a="325889216" From: Ian Campbell To: , Date: Mon, 18 Jan 2016 14:28:55 +0000 Message-ID: <1453127337-16136-10-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 10/12] Qualify TftpDiVersion with the suite. 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 allows the version to differ e.g. between Wheezy and Jessie. Update production-config* to set TftpDiVersion_jessie instead of just TftpDiVersion, also add TftpDiVersion_wheezy using the version replaced in commit f610ea162836 "Switch to Debian 8.0 (jessie) as OS for test hosts". In mfi-common we need to check for TftpDiVersion_$suite (_$guestsuite) and TftpDiVersion manually since getconfig In that context will not see any DebianSuite override in the environment. This ensures that when a non-default suite is configured a corresponding useful version of DI is selected. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v2: di_version --- Osstest.pm | 2 +- make-flight | 10 +++++++++- production-config | 3 ++- production-config-cambridge | 3 ++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Osstest.pm b/Osstest.pm index 9ff86ab..814be28 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -224,7 +224,7 @@ sub readglobalconfig () { $c{TftpTmpDir} ||= "$c{TftpPlayDir}tmp/"; $c{TftpDiBase} ||= "$c{TftpPlayDir}debian-installer"; - $c{TftpDiVersion} ||= 'current'; + $c{TftpDiVersion} ||= $c{ "TftpDiVersion_$c{DebianSuite}" } // 'current'; $c{TftpGrubBase} ||= "$c{TftpPlayDir}grub"; $c{TftpGrubVersion} ||= 'current'; diff --git a/make-flight b/make-flight index e0d9e0c..885870c 100755 --- a/make-flight +++ b/make-flight @@ -33,7 +33,15 @@ flight=`./cs-flight-create $blessing $branch` defsuite=`getconfig DebianSuite` defguestsuite=`getconfig GuestDebianSuite` -defdi_version=`getconfig TftpDiVersion` + +# Pick default Debian Installer version to correspond to the chosen +# suite. +if [ -z "$defdi_version" -a -n "$defsuite" ] ; then + defdi_version=`getconfig TftpDiVersion_$defsuite` +fi +if [ -z "$defdi_version" ] ; then + defdi_version=`getconfig TftpDiVersion` +fi guest_di_version=$defdi_version diff --git a/production-config b/production-config index b21153b..42948c8 100644 --- a/production-config +++ b/production-config @@ -87,7 +87,8 @@ TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex% TftpPxeGroup osstest # Update with ./mg-debian-installer-update(-all) -TftpDiVersion 2015-09-18 +TftpDiVersion_wheezy 2015-09-07 +TftpDiVersion_jessie 2015-09-18 # These should normally be the same. # Update with ./mg-cpu-microcode-update diff --git a/production-config-cambridge b/production-config-cambridge index b0b45ac..78d606b 100644 --- a/production-config-cambridge +++ b/production-config-cambridge @@ -69,7 +69,8 @@ TftpPxeTemplates %name%/pxelinux.cfg TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex% TftpPxeGroup osstest -TftpDiVersion 2015-09-18 +TftpDiVersion_wheezy 2015-09-07 +TftpDiVersion_jessie 2015-09-18 # These should normally be the same. MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio