@@ -46,7 +46,6 @@ BEGIN {
preseed_hook_cmds
di_installcmdline_core
di_vg_name
- cfg_tftp_di_version
);
%EXPORT_TAGS = ( );
@@ -1360,12 +1359,6 @@ sub preseed_hook_cmds () {
return $preseed;
}
-sub cfg_tftp_di_version ($) {
- my ($suite) = @_;
- $suite //= 'x def suite'; # will not find $c{...}
- return $c{"TftpDiVersion_$suite"} // $c{TftpDiVersion};
-}
-
sub debian_guest_suite ($) {
my ($gho) = @_;
@@ -84,6 +84,7 @@ BEGIN {
git_massage_url
sshopts authorized_keys
+ cfg_tftp_di_version
remote_perl_script_open remote_perl_script_done
host_reboot target_reboot target_reboot_hard
target_choose_vg target_umount_lv target_await_down
@@ -2251,6 +2252,12 @@ sub authorized_keys () {
return $authkeys;
}
+sub cfg_tftp_di_version ($) {
+ my ($suite) = @_;
+ $suite //= 'x def suite'; # will not find $c{...}
+ return $c{"TftpDiVersion_$suite"} // $c{TftpDiVersion};
+}
+
#---------- webspace for installer ----------
sub await_webspace_fetch_byleaf ($$$$$) {
osstest service owner writes ("[xen-unstable-coverity test] 87991: trouble: broken"): > flight 87991 xen-unstable-coverity real [real] > http://logs.test-lab.xenproject.org/osstest/logs/87991/ > > Failures and problems with tests :-( > > Tests which did not succeed and are blocking, > including tests which could not be run: > coverity-amd64 3 host-install(3) broken REGR. vs. 86387 This is fallout from my attempts to untangle osstest's debian-installer version handling. I have pushed the patch below to osstest pretest and we'll see if it (a) works and (b) helps. Ian. From 162b04ac0dc05e18509caa143c9cb00690193afd Mon Sep 17 00:00:00 2001 From: Ian Jackson <ian.jackson@eu.citrix.com> Date: Wed, 30 Mar 2016 11:33:01 +0100 Subject: [OSSTEST PATCH] TestSupport: Move cfg_tftp_di_version from Debian.pm Strictly speaking this is a Debian-specific function. But it is called by selecthost. TestSupport does not `use Osstest::Debian' right now. As a result, currently, if $suite is not set or TftpDiVersion_$suite is not set, the program will crash with Undefined subroutine &Osstest::TestSupport::cfg_tftp_di_version called at Osstest/TestSupport.pm line 865. Fix this by moving cfg_tftp_di_version to TestSupport, where it is needed. It would be possible to make the boundary between Osstest::TestSupport and Osstest::Debian firmer by having selecthost explicitly call a selecthost_do_debian_things (perhaps optionally, or as specified by the caller). But would be quite a palaver. It is much more convenient to fudge the issue. (Of course if we have similar requirements for other OS's we can put them in TestSupport too, provided they're not too big and tangly.) Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- Osstest/Debian.pm | 7 ------- Osstest/TestSupport.pm | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)