[OSSTEST PATCH 1/2] config: Default Stash to $c{Logs}, not "logs"

[OSSTEST PATCH 1/2] config: Default Stash to $c{Logs}, not "logs"

[Ian Jackson]

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest.pm                  |    3 ++-
 production-config           |    1 -
 production-config-cambridge |    1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Osstest.pm b/Osstest.pm
index 8948666..fc46487 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -60,7 +60,6 @@ our %c = qw(
     JobDB Standalone
     HostDB Static
 
-    Stash logs
     Images images
     Logs logs
     Results results
@@ -214,6 +213,8 @@ sub readglobalconfig () {
     $c{DefaultBranch} ||= 'xen-unstable';
 
     $c{DebianMirrorHost} ||= 'ftp.debian.org' if $c{DebianMirrorProxy};
+
+    $c{Stash} //= $c{Logs};
 }
 
 sub augmentconfigdefaults {
diff --git a/production-config b/production-config
index 47c0c4c..b17bd66 100644
--- a/production-config
+++ b/production-config
@@ -34,7 +34,6 @@ QueueDaemonHost osstest
 
 ExecutiveDbnamePat dbname=osstestdb;host=db
 
-Stash /home/logs/logs
 Images /home/logs/images
 Logs /home/logs/logs
 
diff --git a/production-config-cambridge b/production-config-cambridge
index 8f6fbe4..693690b 100644
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -32,7 +32,6 @@ NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67
 
 Timezone Europe/London
 
-Stash /home/xc_osstest/logs
 Images /home/xc_osstest/images
 Logs /home/xc_osstest/logs
 
-- 
1.7.10.4

[OSSTEST PATCH 2/2] config: Computed defaults for Logs and Results

[Ian Jackson]

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest.pm                  |    9 +++++++--
 production-config           |    2 --
 production-config-cambridge |    2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Osstest.pm b/Osstest.pm
index fc46487..c89c941 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -61,8 +61,6 @@ our %c = qw(
     HostDB Static
 
     Images images
-    Logs logs
-    Results results
 
     DebianSuite wheezy
     DebianMirrorSubpath debian
@@ -214,6 +212,13 @@ sub readglobalconfig () {
 
     $c{DebianMirrorHost} ||= 'ftp.debian.org' if $c{DebianMirrorProxy};
 
+    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{Stash} //= $c{Logs};
 }
 
diff --git a/production-config b/production-config
index b17bd66..bcb351e 100644
--- a/production-config
+++ b/production-config
@@ -35,9 +35,7 @@ QueueDaemonHost osstest
 ExecutiveDbnamePat dbname=osstestdb;host=db
 
 Images /home/logs/images
-Logs /home/logs/logs
 
-Results /home/logs/results
 PubBaseDir /home/logs
 
 OverlayLocal /home/osstest/overlay-local
diff --git a/production-config-cambridge b/production-config-cambridge
index 693690b..7b54a98 100644
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -33,9 +33,7 @@ NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67
 Timezone Europe/London
 
 Images /home/xc_osstest/images
-Logs /home/xc_osstest/logs
 
-Results /home/xc_osstest/results
 PubBaseDir /home/xc_osstest
 
 OverlayLocal /export/home/osstest/overlay-local
-- 
1.7.10.4

Re: [OSSTEST PATCH 2/2] config: Computed defaults for Logs and Results

[Ian Campbell]

On Fri, 2015-06-19 at 13:38 +0100, Ian Jackson wrote:
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

No functional change AFAICT.

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [OSSTEST PATCH 2/2] config: Computed defaults for Logs and Results

[Ian Jackson]

Ian Campbell writes ("Re: [OSSTEST PATCH 2/2] config: Computed defaults for Logs and Results"):
> On Fri, 2015-06-19 at 13:38 +0100, Ian Jackson wrote:
> > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> 
> No functional change AFAICT.

Indeed.

I have collected these and your --reuse patch into a branch of
miscellany.

Ian.

Re: [OSSTEST PATCH 1/2] config: Default Stash to $c{Logs}, not "logs"

[Ian Campbell]

On Fri, 2015-06-19 at 13:38 +0100, Ian Jackson wrote:
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>