diff options
| author | Alex Bennée | 2018-06-12 22:29:40 +0200 |
|---|---|---|
| committer | Alex Bennée | 2018-06-20 23:13:39 +0200 |
| commit | 5499fa9e449b9620b72e670af4bedbc8590c9b11 (patch) | |
| tree | 8b9e45cb035fb9d4e38a1fb9e235652e3e78dd34 /tests/docker/Makefile.include | |
| parent | docker: docker.py adding age check command (diff) | |
| download | qemu-5499fa9e449b9620b72e670af4bedbc8590c9b11.tar.gz qemu-5499fa9e449b9620b72e670af4bedbc8590c9b11.tar.xz qemu-5499fa9e449b9620b72e670af4bedbc8590c9b11.zip | |
tests/docker/Makefile.include: only force SID to NOCACHE if old
Now we can check the age of a docker image we can be a little more
intelligent about re-building Sid images and only force NOCACHE if
it is "old".
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c0f09505bb..91d9665517 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -75,8 +75,14 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe # force a re-build of the base image if we ever need to build one of # its children. ifndef SKIP_DOCKER_BUILD +ifeq ($(HAVE_USER_DOCKER),y) +SID_AGE=$(shell $(DOCKER_SCRIPT) check --checktype=age --olderthan=180 --quiet qemu:debian-sid) +ifeq ($(SID_AGE),) +else docker-image-debian-sid: NOCACHE=1 endif +endif +endif docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid |