From patchwork Fri Jan 8 14:29:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 7986831 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 8E88FBEEE5 for ; Fri, 8 Jan 2016 14:32:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B108520149 for ; Fri, 8 Jan 2016 14:32: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 CC97920142 for ; Fri, 8 Jan 2016 14:32:47 +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 1aHY3W-0004sr-Tu; Fri, 08 Jan 2016 14:30:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHY3T-0004pP-TF for xen-devel@lists.xen.org; Fri, 08 Jan 2016 14:30:16 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 87/11-24450-7F7CF865; Fri, 08 Jan 2016 14:30:15 +0000 X-Env-Sender: prvs=80839a509=Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1452263405!13575267!4 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 4394 invoked from network); 8 Jan 2016 14:30:14 -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:14 -0000 X-IronPort-AV: E=Sophos;i="5.20,538,1444694400"; d="scan'208";a="323696143" From: Ian Campbell To: , Date: Fri, 8 Jan 2016 14:29:57 +0000 Message-ID: <1452263399-14094-10-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: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH RFC OSSTEST v1 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 --- Osstest.pm | 2 +- mfi-common | 6 ++++++ production-config | 3 ++- production-config-cambridge | 3 ++- 4 files changed, 11 insertions(+), 3 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/mfi-common b/mfi-common index c1c4ec5..1daa6dd 100644 --- a/mfi-common +++ b/mfi-common @@ -124,6 +124,9 @@ create_build_jobs () { fi if [ -z "$diversion" ] ; then + local diversion=`getconfig TftpDiVersion_$suite` + fi + if [ -z "$diversion" ] ; then local diversion=`getconfig TftpDiVersion` fi @@ -413,6 +416,9 @@ test_matrix_iterate () { fi if [ -z "$diversion" ] ; then + local diversion=`getconfig TftpDiVersion_$guestsuite` + fi + if [ -z "$diversion" ] ; then local diversion=`getconfig TftpDiVersion` fi 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