From patchwork Fri Jan 8 14:29:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 7986911 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 28625BEEE5 for ; Fri, 8 Jan 2016 14:33:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51B63201DD for ; Fri, 8 Jan 2016 14:33:13 +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 62E1820142 for ; Fri, 8 Jan 2016 14:33:12 +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 1aHY3X-0004th-J0; Fri, 08 Jan 2016 14:30:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHY3V-0004rQ-Uo for xen-devel@lists.xen.org; Fri, 08 Jan 2016 14:30:18 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id D9/D8-09708-9F7CF865; Fri, 08 Jan 2016 14:30:17 +0000 X-Env-Sender: prvs=80839a509=Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1452263391!9194023!5 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 20359 invoked from network); 8 Jan 2016 14:30:14 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-21.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="329856692" From: Ian Campbell To: , Date: Fri, 8 Jan 2016 14:29:58 +0000 Message-ID: <1452263399-14094-11-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 11/12] mfi-common: usual_debianhvm_image: derive version from $guestsuite 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 more likely matches the callers intention. Move the setting into production-config* alongside the Suite and TftpDiVersion settings. Continue to support $DEBIAN_IMAGE_VERSION as an override. The value for Wheezy is from what was replaced in 610ea1628363 "Switch to Debian 8.0 (jessie) as OS for test hosts". Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- mfi-common | 6 +++++- production-config | 4 ++++ production-config-cambridge | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index 1daa6dd..82f0503 100644 --- a/mfi-common +++ b/mfi-common @@ -347,7 +347,11 @@ job_create_test () { usual_debianhvm_image () { local arch=$1; shift - echo debian-${DEBIAN_IMAGE_VERSION-8.2.0}-$arch-CD-1.iso + local ver=$DEBIAN_IMAGE_VERSION + if [ -z "$ver" ] ; then + ver=`getconfig DebianImageVersion_$guestsuite` + fi + echo debian-$ver-$arch-CD-1.iso } # Iterate over xenarch, dom0arch and kernel calling test_matrix_do_one diff --git a/production-config b/production-config index 42948c8..21b215d 100644 --- a/production-config +++ b/production-config @@ -90,6 +90,10 @@ TftpPxeGroup osstest TftpDiVersion_wheezy 2015-09-07 TftpDiVersion_jessie 2015-09-18 +# For ISO installs +DebianImageVersion_wheezy 7.2.0 +DebianImageVersion_jessie 8.2.0 + # These should normally be the same. # Update with ./mg-cpu-microcode-update MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio diff --git a/production-config-cambridge b/production-config-cambridge index 78d606b..a9be7a8 100644 --- a/production-config-cambridge +++ b/production-config-cambridge @@ -72,6 +72,10 @@ TftpPxeGroup osstest TftpDiVersion_wheezy 2015-09-07 TftpDiVersion_jessie 2015-09-18 +# For ISO installs +DebianImageVersion_wheezy 7.2.0 +DebianImageVersion_jessie 8.2.0 + # These should normally be the same. MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio