[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64
From: |
Alex Bennée |
Subject: |
[PATCH v2 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 |
Date: |
Thu, 1 Apr 2021 11:25:21 +0100 |
Currently our gitlab registry is x86_64 only so attempting to pull an
image from it on something else will end in tears.
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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))
--
2.20.1
- [PATCH for 6.0-rc2 v2 00/11] various fixes, pre-PR (check-tcg, gdbstub, gitlab), Alex Bennée, 2021/04/01
- [PATCH v2 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64,
Alex Bennée <=
- [PATCH v2 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers, Alex Bennée, 2021/04/01
- [PATCH v2 03/11] tests/tcg: add concept of container_hosts, Alex Bennée, 2021/04/01
- [PATCH v2 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs, Alex Bennée, 2021/04/01
- [PATCH v2 05/11] tests/tcg/i386: expand .data sections for system tests, Alex Bennée, 2021/04/01
- [PATCH v2 01/11] tests/tcg: update the defaults for x86 compilers, Alex Bennée, 2021/04/01