config: Default Stash to $c{Logs}, not "logs"

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index 89486669015c8df2a3e085c05e7b3287a6b30687..fc4648729ee330974e0138e27973051783c5fda6 100644 (file)
--- 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 47c0c4caf96a7b5d9f02a839c94ad12b951a8695..b17bd667c0afa48d51d5392281efc75fe22f8262 100644 (file)
--- 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 8f6fbe4f0b8596c046cd08d1d909fe6c508c2353..693690b5bf5d2b628fdb8cdfaa2a46b6b5282240 100644 (file)
--- 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