[Xen-devel] [PATCH OSSTEST v2 5/5] cambridge: Stop publishing logs to chiark

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

http://osstest.cam.xci-test.com/~osstest/testlogs already exists and
points to the live logs directory, so switch PubBaseUrl to that in the
Cambridge config such that email reports etc contain it. This won't be
externally accessible but I think that won't matter now that the
master production instance is elsewhere.

Arrange that cr-publish-flight-logs doesn't publish the corresponding
thing if either LogsPublish or ResultsPublish is not set, and unset
them in the Cambridge config.

Likewise arrange that cr-ensure-disk-space doesn't do anything if the
configuration variable passed as an option is not set, and unset
Publish (the base for {Logs,Results}Publish) in the Cambridge config.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
v2: Check the config variable and not its name.
---
 cr-ensure-disk-space        | 2 ++
 cr-publish-flight-logs      | 4 ++--
 production-config-cambridge | 6 +-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index 0ee84c7..3788e63 100755
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -42,6 +42,8 @@ our ($cfgbase) = @ARGV;
 
 csreadconfig();
 
+exit 0 unless $c{$cfgbase};
+
 open LOCK, "> $c{GlobalLockDir}/publish-lock" or die $!;
 flock LOCK, LOCK_EX or die $!;
 
diff --git a/cr-publish-flight-logs b/cr-publish-flight-logs
index 2e96f60..94c74c8 100755
--- a/cr-publish-flight-logs
+++ b/cr-publish-flight-logs
@@ -59,5 +59,5 @@ sub copydir ($$) {
     $!=0; $?=0; system @cmd; die "rsync $? $!" if $? or $!;
 }
 
-copydir("$c{Logs}/$flight/", "$c{LogsPublish}/$flight");
-copydir("$c{Results}/", "$c{ResultsPublish}");
+copydir("$c{Logs}/$flight/", "$c{LogsPublish}/$flight") if $c{LogsPublish};
+copydir("$c{Results}/", "$c{ResultsPublish}") if $c{ResultsPublish};
diff --git a/production-config-cambridge b/production-config-cambridge
index e44f3b0..a144cef 100644
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -40,16 +40,12 @@ TestHostKeypairPath /export/home/osstest/.ssh/id_rsa_osstest
 
 GitCacheProxy git://drall.uk.xensource.com:9419/
 
-PubBaseUrl http://www.chiark.greenend.org.uk/~xensrcts
+PubBaseUrl http://osstest.cam.xci-test.com/~osstest/testlogs
 ReportHtmlPubBaseUrl="$c{PubBaseUrl}/logs"
 ResultsHtmlPubBaseUrl="$c{PubBaseUrl}/results"
 
-Publish xensrcts@xxxxxxxxxxxxxxxxxxxxxxxxxxxx:/home/ian/work/xc_osstest
 GlobalLockDir /export/home/osstest/testing.git
 
-LogsPublish= "$c{Publish}/logs"
-ResultsPublish= "$c{Publish}/results"
-
 ReportTrailer= <<END
 Logs, config files, etc. are available at
     $c{ReportHtmlPubBaseUrl}
-- 
2.1.4


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