summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-17 12:00:13 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-17 12:00:13 +0000
commit60366a22123abdb23afdba3e194fa31d6ec5d875 (patch)
treefdabde2693281420335035cfff6c1b18624d7791
parent1cc288d245f99effa7e12f52aca47e9a96d0a336 (diff)
downloadmorph-60366a22123abdb23afdba3e194fa31d6ec5d875.tar.gz
scripts/distbuild: Fix artifacts not being shared
We need to pass --artifact-cache-server as well as --writable-cache-server to the `morph controller-daemon` process, otherwise it uses git.baserock.org as the shared artifact cache. Using git.baserock.org results in each build starting from scratch instead of reusing the already-build artifacts in the artifact cache set up by the test harness.
-rwxr-xr-xscripts/distbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/distbuild b/scripts/distbuild
index 647ba1a7..148b177c 100755
--- a/scripts/distbuild
+++ b/scripts/distbuild
@@ -441,6 +441,7 @@ class DistbuildTestHarness(cliapp.Application):
'morph-instance': morph_instance,
'worker': ','.join(workers),
'worker-cache-server-port': worker_cache.port,
+ 'artifact-cache-server': shared_cache_url,
'writeable-cache-server': shared_cache_url,
},
log_path=workdir)