[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64
From: |
Alex Bennée |
Subject: |
[PULL 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 |
Date: |
Tue, 6 Apr 2021 16:00:32 +0100 |
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>
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
- [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Alex Bennée, 2021/04/06
- [PULL 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64,
Alex Bennée <=
- [PULL 08/11] docs/system/gdb.rst: Add some more heading structure, Alex Bennée, 2021/04/06
- [PULL 03/11] tests/tcg: add concept of container_hosts, Alex Bennée, 2021/04/06
- [PULL 05/11] tests/tcg/i386: expand .data sections for system tests, Alex Bennée, 2021/04/06
- [PULL 01/11] tests/tcg: update the defaults for x86 compilers, Alex Bennée, 2021/04/06
- [PULL 10/11] gitlab-ci.yml: Fix the filtering for the git submodules, Alex Bennée, 2021/04/06
- [PULL 06/11] tests/tcg/i386: force -fno-pie for test-i386, Alex Bennée, 2021/04/06
- [PULL 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers, Alex Bennée, 2021/04/06
- [PULL 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs, Alex Bennée, 2021/04/06
- [PULL 09/11] docs/system/gdb.rst: Document how to debug multicore machines, Alex Bennée, 2021/04/06
- [PULL 07/11] tests/tcg: relax the next step precision of the gdb sha1 test, Alex Bennée, 2021/04/06