Publish: Default LogsPublish and ResultsPublish from Publish

And delete the explicit settings from production-config.

No functional change.

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

diff --git a/Osstest.pm b/Osstest.pm
index 3377ea399f8cf70ef52a78bad31e73c773250ebd..738ed4f732c231f88b7e91d3f672721f2fd4e537 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -255,8 +255,8 @@ END
     my $pubbaseprefix = $c{PubBaseDir} ? "$c{PubBaseDir}/" : "";
     foreach my $l (qw(logs results)) {
        my $u = ucfirst $l;
-       next if defined $c{$u};
-       $c{"${u}"} = "$pubbaseprefix$l";
+       $c{"${u}"} //= "$pubbaseprefix$l";
+       $c{"${u}Publish"} //= "$c{Publish}/$l" if defined $c{Publish};
     }
 
     $c{Stash} //= $c{Logs};

diff --git a/production-config b/production-config
index 48b1e8e419b8be5135660c70e657f317ef314b8c..df02cd372c1ede00a4aedb383bace13a603cfc3f 100644 (file)
--- a/production-config
+++ b/production-config
@@ -59,9 +59,6 @@ ReportHtmlUnpubBaseUrl="http://osstest/~osstest/pub/logs/"
 Publish osstest@www:/var/www/osstest
 GlobalLockDir /home/osstest/testing.git
 
-LogsPublish= "$c{Publish}/logs"
-ResultsPublish= "$c{Publish}/results"
-
 HarnessPublishGitUserHost osstest@xenbits.xen.org
 HarnessPublishGitRepoDir ext/osstest-massachusetts.git