diff options
| author | Alex Bennée | 2021-04-01 12:25:21 +0200 |
|---|---|---|
| committer | Alex Bennée | 2021-04-06 16:04:42 +0200 |
| commit | 34019198a19a8e0bb94ffeb5d0a8ffe4b8a4616e (patch) | |
| tree | 3edd8f590e25888822a6534ccb7ec8edb465ee9a /tests/docker/Makefile.include | |
| parent | tests/tcg: update the defaults for x86 compilers (diff) | |
| download | qemu-34019198a19a8e0bb94ffeb5d0a8ffe4b8a4616e.tar.gz qemu-34019198a19a8e0bb94ffeb5d0a8ffe4b8a4616e.tar.xz qemu-34019198a19a8e0bb94ffeb5d0a8ffe4b8a4616e.zip | |
tests/docker: don't set DOCKER_REGISTRY on non-x86_64
Currently our gitlab registry is x86_64 only so attempting to pull an
image from it on something else will end in tears.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210401102530.12030-3-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7cab761bf5..9f464cb92c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -16,7 +16,10 @@ DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.doc DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache -DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),registry.gitlab.com/qemu-project/qemu) +ifeq ($(HOST_ARCH),x86_64) +DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu +endif +DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) DOCKER_TESTS := $(notdir $(shell \ find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) |