diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-03-03 11:01:32 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-04-14 16:33:02 +0000 |
| commit | aa5de99b9fefc3dceaa296789329b20e9f6a7b8e (patch) | |
| tree | 0c8dfc447af67fd007447a6ccd03a627349ab4bf /yarns/morph.shell-lib | |
| parent | 20a72466dbe78f7bdd5f46fccd17ce912f6a50bf (diff) | |
| download | morph-aa5de99b9fefc3dceaa296789329b20e9f6a7b8e.tar.gz | |
yarns: Make the distbuild yarn expose the worker's artifact cache over HTTP
OSTree can easily pull over HTTP. All that is necessary is to expose the
repo directory. This commit adds a simple HTTP server to do this in the
test suite. Actual implementations should use something better, like
lighttpd.
Also add some logging of the cache servers in this yarn to help debug.
Change-Id: Ic65390f550c972c5f1072bbca8d80e8b56723158
Diffstat (limited to 'yarns/morph.shell-lib')
| -rw-r--r-- | yarns/morph.shell-lib | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/yarns/morph.shell-lib b/yarns/morph.shell-lib index e7011091..3252b30f 100644 --- a/yarns/morph.shell-lib +++ b/yarns/morph.shell-lib @@ -39,7 +39,7 @@ run_morph() "$SRCDIR"/morph --verbose \ --cachedir-min-space=0 --tempdir-min-space=0 \ --no-default-config --config "$DATADIR/morph.conf" \ - --log="$DATADIR/log-$1" \ + --log="$DATADIR/log-$1" --ostree-repo-mode="archive_z2" \ "$@" 2> "$DATADIR/result-$1" > "$DATADIR/out-$1" local exit_code="$?" for o in log result out; do @@ -194,6 +194,7 @@ start_cache_server(){ --background --make-pidfile --verbose \ --startas="$SRCDIR/morph-cache-server" -- \ --port-file="$1" --no-fcgi \ + --log="$4" \ --repo-dir="$DATADIR/gits" --direct-mode \ --bundle-dir="$DATADIR/bundles" \ --artifact-dir="$3" "$@" |