All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Thomas Huth" <thuth@redhat.com>,
	berrange@redhat.com,
	"Richard Henderson" <richard.henderson@linaro.org>,
	f4bug@amsat.org,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Willian Rampazzo" <willianr@redhat.com>,
	stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com,
	"Alex Bennée" <alex.bennee@linaro.org>,
	aurelien@aurel32.net
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	[thread overview]
Message-ID: <20210401102530.12030-3-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210401102530.12030-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.

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



  parent reply	other threads:[~2021-04-01 10:28 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-01 10:25 [PATCH for 6.0-rc2 v2 00/11] various fixes, pre-PR (check-tcg, gdbstub, gitlab) Alex Bennée
2021-04-01 10:25 ` [PATCH v2 01/11] tests/tcg: update the defaults for x86 compilers Alex Bennée
2021-04-06 10:29   ` Philippe Mathieu-Daudé
2021-04-01 10:25 ` Alex Bennée [this message]
2021-04-01 10:25 ` [PATCH v2 03/11] tests/tcg: add concept of container_hosts Alex Bennée
2021-04-02 16:23   ` Richard Henderson
2021-04-06 11:16   ` Philippe Mathieu-Daudé
2021-04-01 10:25 ` [PATCH v2 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers Alex Bennée
2021-04-02 16:26   ` Richard Henderson
2021-04-06  9:46     ` Alex Bennée
2021-04-01 10:25 ` [PATCH v2 05/11] tests/tcg/i386: expand .data sections for system tests Alex Bennée
2021-04-01 10:25 ` [PATCH v2 06/11] tests/tcg/i386: force -fno-pie for test-i386 Alex Bennée
2021-04-02 16:27   ` Richard Henderson
2021-04-06 13:59     ` Alex Bennée
2021-04-01 10:25 ` [PATCH v2 07/11] tests/tcg: relax the next step precision of the gdb sha1 test Alex Bennée
2021-04-02 16:41   ` Richard Henderson
2021-04-02 18:38     ` Richard Henderson
2021-04-06  9:43     ` Alex Bennée
2021-04-01 10:25 ` [PATCH v2 08/11] docs/system/gdb.rst: Add some more heading structure Alex Bennée
2021-04-01 10:25 ` [PATCH v2 09/11] docs/system/gdb.rst: Document how to debug multicore machines Alex Bennée
2021-04-01 10:25 ` [PATCH v2 10/11] gitlab-ci.yml: Fix the filtering for the git submodules Alex Bennée
2021-04-01 14:17   ` Willian Rampazzo
2021-04-01 10:25 ` [PATCH v2 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs Alex Bennée

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=20210401102530.12030-3-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.