Publish: Introduce {Logs,Results}PublishSshOpts

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index 738ed4f732c231f88b7e91d3f672721f2fd4e537..85a6e78bb664a5d76bad5ce73aa3a3a7f8fb0b86 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -257,6 +257,7 @@ END
        my $u = ucfirst $l;
        $c{"${u}"} //= "$pubbaseprefix$l";
        $c{"${u}Publish"} //= "$c{Publish}/$l" if defined $c{Publish};
+       $c{"${u}PublishSshOpts"} //= $c{PublishSshOpts} // [];
     }
 
     $c{Stash} //= $c{Logs};

diff --git a/Osstest/Management.pm b/Osstest/Management.pm
index c1ed2ace4c6dfba00a965aee1c5df5089689812e..4edb3617c064b9cb1c94f0bceebe26f416b8a127 100644 (file)
--- a/Osstest/Management.pm
+++ b/Osstest/Management.pm
@@ -44,7 +44,7 @@ our @logsshopts;
 
 sub publish_ssh_opts ($) {
     my ($cfgbase) = @_; # LogsPublish or ResultsPublish
-    return (qw(-o batchmode=yes));
+    return (qw(-o batchmode=yes), @{$c{"${cfgbase}SshOpts"}});
 }
 
 sub logs_select ($) {