[PATCH v4 01/17] tests/docker: expose $HOME/.cache/qemu as docker volume

[Alex Bennée]

If you want to run functional tests we should share .cache/qemu so we
don't force containers to continually re-download images. We also move
ccache to use this shared area.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>

---
v3
  - mention ccache
v2
  - Share a whole .cache/qemu path.
---
 tests/docker/Makefile.include | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index fa1cbb6726..3959d8a028 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -185,8 +185,10 @@ docker:
 
 docker-help: docker
 
+# Where QEMU caches build artefacts
+DOCKER_QEMU_CACHE_DIR := $$HOME/.cache/qemu
 # Use a global constant ccache directory to speed up repetitive builds
-DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
+DOCKER_QEMU_CCACHE_DIR := DOCKER_QEMU_CACHE_DIR/docker-ccache
 
 # This rule if for directly running against an arbitrary docker target.
 # It is called by the expanded docker targets (e.g. make
@@ -195,7 +197,7 @@ DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
 # For example: make docker-run TEST="test-quick" IMAGE="debian:arm64" 
EXECUTABLE=./aarch64-linux-user/qemu-aarch64
 #
 docker-run: docker-qemu-src
-       @mkdir -p "$(DOCKER_CCACHE_DIR)"
+       @mkdir -p "$(DOCKER_QEMU_CCACHE_DIR)"
        @if test -z "$(IMAGE)" || test -z "$(TEST)"; \
                then echo "Invalid target $(IMAGE)/$(TEST)"; exit 1; \
        fi
@@ -222,8 +224,8 @@ docker-run: docker-qemu-src
                        -e V=$V -e J=$J -e DEBUG=$(DEBUG)               \
                        -e SHOW_ENV=$(SHOW_ENV)                         \
                        $(if $(NOUSER),,                                \
-                               -e CCACHE_DIR=/var/tmp/ccache           \
-                               -v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
+                               -v 
$(DOCKER_QEMU_CACHE_DIR):$(DOCKER_QEMU_CACHE_DIR)    \
+                               -e CCACHE_DIR=$(DOCKER_QEMU_CCACHE_DIR) \
                        )                                               \
                        -v $$(readlink -e 
$(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \
                        $(IMAGE)                                        \
-- 
2.47.2