From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Willian Rampazzo" <willianr@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PATCH v1 2/6] tests/docker: don't set DOCKER_REGISTRY on non-x86_64
Date: Mon, 29 Mar 2021 12:02:59 +0100 [thread overview]
Message-ID: <20210329110303.15235-3-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210329110303.15235-1-alex.bennee@linaro.org>
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>
---
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
next prev parent reply other threads:[~2021-03-29 11:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 11:02 [PATCH for 6.0-rc2? v1 0/6] check-tcg for non-x86 hosts Alex Bennée
2021-03-29 11:02 ` [PATCH v1 1/6] tests/tcg: update the defaults for x86 compilers Alex Bennée
2021-03-30 15:24 ` Richard Henderson
2021-03-29 11:02 ` Alex Bennée [this message]
2021-03-29 11:36 ` [PATCH v1 2/6] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 Thomas Huth
2021-03-29 14:37 ` Willian Rampazzo
2021-03-30 15:24 ` Richard Henderson
2021-03-31 12:32 ` Philippe Mathieu-Daudé
2021-03-31 14:57 ` Alex Bennée
2021-03-29 11:03 ` [PATCH v1 3/6] tests/tcg: add concept of container_hosts Alex Bennée
2021-03-29 11:03 ` [PATCH v1 4/6] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers Alex Bennée
2021-03-29 11:03 ` [PATCH v1 5/6] tests/tcg/i386: expand .data sections for system tests Alex Bennée
2021-03-29 11:39 ` Thomas Huth
2021-03-30 15:27 ` Richard Henderson
2021-03-29 11:03 ` [PATCH v1 6/6] tests/i386/test-i386: try and correct constrain 16 bit call (WIP) Alex Bennée
2021-03-30 15:58 ` Richard Henderson
2021-03-30 18:20 ` Alex Bennée
2021-03-30 20:25 ` Richard Henderson
2021-03-30 20:46 ` Peter Maydell
2021-03-30 21:18 ` Richard Henderson
2021-03-29 11:12 ` [PATCH for 6.0-rc2? v1 0/6] check-tcg for non-x86 hosts no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210329110303.15235-3-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).