[Xen-devel] [OSSTEST PATCH 2/8] Publish: Default LogsPublish and ResultsPublish from Publish

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

And delete the explicit settings from production-config.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 Osstest.pm        | 4 ++--
 production-config | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Osstest.pm b/Osstest.pm
index 3377ea3..738ed4f 100644
--- 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 48b1e8e..df02cd3 100644
--- 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@xxxxxxxxxxxxxxx
 HarnessPublishGitRepoDir ext/osstest-massachusetts.git
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel