From patchwork Fri Jan 8 14:29:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 7986931 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 EFEBBBEEE5 for ; Fri, 8 Jan 2016 14:36:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B24C201CD for ; Fri, 8 Jan 2016 14:36:26 +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 5D56720149 for ; Fri, 8 Jan 2016 14:36:25 +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 1aHY7B-0006dl-HG; Fri, 08 Jan 2016 14:34:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHY79-0006dL-2d for xen-devel@lists.xen.org; Fri, 08 Jan 2016 14:34:03 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 94/B0-09834-AD8CF865; Fri, 08 Jan 2016 14:34:02 +0000 X-Env-Sender: prvs=80839a509=Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1452263640!11794936!1 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 11863 invoked from network); 8 Jan 2016 14:34:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jan 2016 14:34:01 -0000 X-IronPort-AV: E=Sophos;i="5.20,538,1444694400"; d="scan'208";a="329858129" From: Ian Campbell To: , Date: Fri, 8 Jan 2016 14:29:53 +0000 Message-ID: <1452263399-14094-6-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 06/12] ts-host-install: Support DiVersion coming from runvars 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 To do so initialise $ho->{DiVersion} in select host and use it in ts-host-install. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/TestSupport.pm | 1 + ts-host-install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 3923b18..7ea4f19 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -862,6 +862,7 @@ sub selecthost ($) { }; if (defined $job) { $ho->{Suite} = target_var($ho, "suite") // $c{DebianSuite}; + $ho->{DiVersion} = target_var($ho, "diversion") // $c{TftpDiVersion}; } #----- handle hosts which are themselves guests (nested) ----- diff --git a/ts-host-install b/ts-host-install index eb740fa..ecf5f0b 100755 --- a/ts-host-install +++ b/ts-host-install @@ -157,7 +157,7 @@ END sub setup_pxeboot_firstboot($) { my ($ps_url) = @_; - my $d_i= $ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'.$c{TftpDiVersion}.'-'.$ho->{Suite}; + my $d_i= $ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'.$ho->{DiVersion}.'-'.$ho->{Suite}; my @dicmdline= qw(vga=normal); push @dicmdline, di_installcmdline_core($ho, $ps_url, %xopts);