xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 6/6] Various: Honour suite-specific TftpDiVersion
Date: Fri, 18 Mar 2016 17:09:15 +0000	[thread overview]
Message-ID: <1458320955-2556-7-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1458320955-2556-1-git-send-email-ian.jackson@eu.citrix.com>

Replace references to $c{TftpDiVersion} in the general osstest code
with calls to cfg_tftp_di_version.  This means that the suite-specific
d-i version will, in general, be honoured (as is correct).

In preseed_create, we also honour $ho->{DiVersion}.  Often this won't
be set, but it might be (for example, by selecthost finding di_version
runvars).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest/Debian.pm      |    5 +++--
 Osstest/TestSupport.pm |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index f3c2f63..1e4900b 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1010,7 +1010,8 @@ sub preseed_create ($$;@) {
     my $suite= $ho->{Suite};
 
     my $d_i= $ho->{Tftp}{Path}.'/'.$ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'.
-	$c{TftpDiVersion}.'-'.$ho->{Suite};
+	($ho->{DiVersion} // cfg_tftp_di_version($ho->{Suite}))
+	.'-'.$ho->{Suite};
 
     preseed_hook_installscript($ho, $sfx,
           '/lib/partman/init.d', '000override-parted-devices', <<END);
@@ -1384,7 +1385,7 @@ sub debian_guest_di_version ($) {
     $gho->{DiVersion} //= guest_var($gho,'di_version',undef);
 
     if (!$gho->{DiVersion}) {
-	$gho->{DiVersion} = $c{TftpDiVersion};
+	$gho->{DiVersion} = cfg_tftp_di_version(debian_guest_suite($gho));
 	store_runvar("$gho->{Guest}_di_version", $gho->{DiVersion});
     }
 
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 0b3e18a..572d657 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -862,7 +862,8 @@ sub selecthost ($) {
     };
     if (defined $job) {
 	$ho->{Suite} = target_var($ho, "suite") // $c{DebianSuite};
-	$ho->{DiVersion} = target_var($ho, "di_version") // $c{TftpDiVersion};
+	$ho->{DiVersion} = target_var($ho, "di_version")
+	    // cfg_tftp_di_version($ho->{Suite});
     }
 
     #----- handle hosts which are themselves guests (nested) -----
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

  parent reply	other threads:[~2016-03-18 17:09 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-18 17:09 [OSSTEST PATCH 0/6] Fix TftpDiVersion plumbing Ian Jackson
2016-03-18 17:09 ` [OSSTEST PATCH 1/6] Debian: Provide cfg_tftp_di_version Ian Jackson
2016-03-18 17:09 ` [OSSTEST PATCH 2/6] make-flight: Use getconfig_TftpDiVersion_suite Ian Jackson
2016-03-18 17:09 ` [OSSTEST PATCH 3/6] mg-debian-installer-update: " Ian Jackson
2016-03-18 17:09 ` [OSSTEST PATCH 4/6] mg-debian-installer-update: Print a TftpDiVersion_$suite setting too Ian Jackson
2016-03-18 17:09 ` [OSSTEST PATCH 5/6] standalone-reset: Use suite-specific TftpDiVersion Ian Jackson
2016-03-18 17:09 ` Ian Jackson [this message]
2016-03-18 18:23 ` [OSSTEST PATCH 7/6] make-flight: Set debianhvm_suite for Debian HVM tests Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458320955-2556-7-git-send-email-ian.jackson@eu.citrix.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).