From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH OSSTEST 5/5] cambridge: Stop publishing logs to chiark Date: Thu, 2 Apr 2015 12:25:13 +0100 Message-ID: <1427973913.4037.57.camel@citrix.com> References: <1427900998.13425.21.camel@citrix.com> <1427901022-24314-5-git-send-email-ian.campbell@citrix.com> <21789.9472.250952.263646@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <21789.9472.250952.263646@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Jackson Cc: xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Thu, 2015-04-02 at 12:16 +0100, Ian Jackson wrote: > Ian Campbell writes ("[PATCH OSSTEST 5/5] cambridge: Stop publishing logs to chiark"): > > 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 > > --- > > 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..84b1890 100755 > > --- a/cr-ensure-disk-space > > +++ b/cr-ensure-disk-space > > @@ -40,6 +40,8 @@ die unless @ARGV==1; > > > > our ($cfgbase) = @ARGV; > > > > +exit 0 unless $cfgbase; > > > > csreadconfig(); > > Don't you mean "unless $c{$cfgbase}" ? I think I do, yes. > And then it has to come after csreadconfig. (Did you test this ?) I was running in standalone mode, so I don't think this code will have actually been run, I was relying on my ability to reason about the code, which apparently failed :-/. Shall I run an adhoc flight with this change in it? Ian.