From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH RFC OSSTEST v1 06/12] ts-host-install: Support DiVersion coming from runvars Date: Fri, 8 Jan 2016 14:29:53 +0000 Message-ID: <1452263399-14094-6-git-send-email-ian.campbell@citrix.com> References: <1452263368.29416.39.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1452263368.29416.39.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org To do so initialise $ho->{DiVersion} in select host and use it in ts-host-install. Signed-off-by: Ian Campbell --- 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); -- 2.6.1