From nobody Sat Feb 7 08:53:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767791004; cv=none; d=zohomail.com; s=zohoarc; b=DdE80Md0AkQPBS1kdTWLqqW3YATDstK/BFWC0NC6j6R0QTZbEXXwaXEeCI21zAXcw+caM4Uf3JFSJZ7NTIK84Hj5YNWfUGmVOht1aKjUd4zQwJ/VgEqnA//n0/6jU7o84sdwUnrVsdf9cTbaYonV1VpNxGKBdqGXKgULQo6ZNt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767791004; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=31aPuuD3PU7TZIw48kRji4jd9O4iQc8f9NEiWcxMzF0=; b=gLR9Fktq68pRjzBAYb+so5w0iBjMHEJJb3V9EckzFxsF5O1mD73pre/YtxJ4X6T9zJvCX9POLMLEZ8guQ3yePbRfLY6NHQPCN+dtUu3VDYQASpHuB0xdQvU7fbBoIuEFoxKc4PSvH/7IbN4ltfuBAj/Fix92vwNhJkmHla43rkE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767791004309860.0002513851528; Wed, 7 Jan 2026 05:03:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdTBC-00050P-MZ; Wed, 07 Jan 2026 08:02:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAk-0004vg-8u for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:02:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAi-0007Bs-LL for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:01:58 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-458-gw8mIWIGPKGrwjbYXUdmAQ-1; Wed, 07 Jan 2026 08:01:51 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 64D1F19560B6; Wed, 7 Jan 2026 13:01:50 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.169]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AD80419560A2; Wed, 7 Jan 2026 13:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767790915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=31aPuuD3PU7TZIw48kRji4jd9O4iQc8f9NEiWcxMzF0=; b=YnIGdC64BsiMIDaksxxv83yoga1+EIm3H+g9nhPooj4l2n9whKPvk2P+sEddsWL3LX6u8v CZkxFO7p5FpmcSATb+UYlYDvqcpovpRYLTZ3/nPXHRL1BnJmH1DSOUaAxT8hmCi/9XRJBD Ci5+xCK0BIX85hHb+mee3LkNuKDXQ84= X-MC-Unique: gw8mIWIGPKGrwjbYXUdmAQ-1 X-Mimecast-MFC-AGG-ID: gw8mIWIGPKGrwjbYXUdmAQ_1767790910 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 1/4] tests/docker: improve handling of docker probes Date: Wed, 7 Jan 2026 13:01:42 +0000 Message-ID: <20260107130145.1495219-2-berrange@redhat.com> In-Reply-To: <20260107130145.1495219-1-berrange@redhat.com> References: <20260107130145.1495219-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767791006006158500 The docker.py script has logic to guess the container command and detects one of * docker * sudo -n docker * podman but the "docker.py probe" command then throws away the detected argv and prints a slightly different argv based soley on the detected argv[0]. The result is that 'probe' will print * docker * sudo docker * podman which means that if sudo was detected & the result of 'probe' were used direclty, it would end up prompting for password interaction every time. The 'configure' script, however, runs 'probe' and then throws away the printed argv again, reporting only 'podman' or 'docker', which is used to set the $(RUNC) variable for tests/docker/Makefile.include which is in turn used to pass --engine to docker.py. So the docker.py command will re-detect the need for 'sudo -n' and use it correctly The problem with this is that some commands in Makefile.include do not call docker.py at all, they invoke $(RUNC) directly. Since configure threw away the 'sudo' command prefix Makefile.in won't be adding either 'sudo' or 'sudo -n', it'll just run plani 'docker' which is wrong. This commit sanitizes things so that the 'docker.py probe' prints out the exact detected ARGV, and configure fully preserves this ARGV when setting $(RUNC). Since "$(RUNC)" is no longer just a bare engine name, however, we must now also set the $(CONTAINER_ENGINE) variable for Makefile.include so it can pass something sane to the --engine arg for docker.py Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- configure | 19 +++++++------------ tests/docker/Makefile.include | 5 +++-- tests/docker/docker.py | 7 +------ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 55e0bd3425..1adbb357df 100755 --- a/configure +++ b/configure @@ -1316,17 +1316,11 @@ fi ########################################## # functions to probe cross compilers =20 -container=3D"no" -runc=3D"" +runc=3D"no" if test $use_containers =3D "yes" && (has "docker" || has "podman"); then - case $($python "$source_path"/tests/docker/docker.py --engine "$contai= ner_engine" probe) in - *docker) container=3Ddocker ;; - podman) container=3Dpodman ;; - no) container=3Dno ;; - esac - if test "$container" !=3D "no"; then - docker_py=3D"$python $source_path/tests/docker/docker.py --engine = $container" - runc=3D$container + runc=3D$($python "$source_path"/tests/docker/docker.py --engine "$cont= ainer_engine" probe) + if test "$runc" !=3D "no"; then + docker_py=3D"$python $source_path/tests/docker/docker.py --engine = $container_engine" fi fi =20 @@ -1446,7 +1440,7 @@ probe_target_compiler() { esac =20 for host in $container_hosts; do - test "$container" !=3D no || continue + test "$runc" !=3D no || continue test "$host" =3D "$cpu" || continue case $target_arch in # debian-all-test-cross architectures @@ -1775,8 +1769,9 @@ echo all: >> $config_host_mak echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak echo "GDB=3D$gdb_bin" >> $config_host_mak -if test "$container" !=3D no; then +if test "$runc" !=3D no; then echo "RUNC=3D$runc" >> $config_host_mak + echo "CONTAINER_ENGINE=3D$container_engine" >> $config_host_mak fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak if test "$rust" !=3D disabled; then diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 38467cca61..7d4582b6a8 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -16,8 +16,9 @@ DOCKER_DEFAULT_REGISTRY :=3D registry.gitlab.com/qemu-pro= ject/qemu endif DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTR= Y)) =20 -RUNC ?=3D $(if $(shell command -v docker), docker, podman) -DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py --engine $(RUNC) +CONTAINER_ENGINE =3D auto +DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py --engine $(CONTAINER_EN= GINE) +RUNC ?=3D $(shell $(DOCKER_SCRIPT) probe) =20 CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY :=3D $(BUILD_DIR)/docker-src.$(CUR_TIME) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 3b8a26704d..ff68c7bf6f 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -618,12 +618,7 @@ class ProbeCommand(SubCommand): def run(self, args, argv): try: docker =3D Docker() - if docker._command[0] =3D=3D "docker": - print("docker") - elif docker._command[0] =3D=3D "sudo": - print("sudo docker") - elif docker._command[0] =3D=3D "podman": - print("podman") + print(" ".join(docker._command)) except Exception: print("no") =20 --=20 2.52.0 From nobody Sat Feb 7 08:53:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767790980; cv=none; d=zohomail.com; s=zohoarc; b=Hhq7IF3Xhv/UMU5pib8gR0k3Ff35Vdzz9nREQN1rOksO/YKve+E/C4aQmLyuz4QP/o2hAsXhfylvQBLKaVtGJly/BwDViVRnS8rq8ysI25O1u5lHYK1lAtlbHZPyKXwNc9zp8h9N+NW0YIsMG+i/JYPfQUA5MtIidLZlRC7WlZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767790980; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kubT+ovvIz8B3qKCu1Vkgo6tV5welKZjjdi75BU2CIs=; b=axKKQPWwMEuV8rLyJRKaJR88Tl0Hepkb1YpNSJ4+dJLuxxo0I9oGlf6nHetQIiDSW5s1FIDDVAHLrlCqYexA6rmLXtf5BUoaDMVGDdOD7GWIPW4z/ScgW+wNOEtDvPi/TmgM9LGI2sirzzI5ds2thFKQ6Z7ChUlNAMEJ223kU7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767790980569647.0648175346793; Wed, 7 Jan 2026 05:03:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdTBE-00051c-U7; Wed, 07 Jan 2026 08:02:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAm-0004vz-4V for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:02:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAj-0007Bw-AA for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:01:58 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-647-B3mPg5rFM2ukEAlKVxoOeA-1; Wed, 07 Jan 2026 08:01:55 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BA8E319540DE; Wed, 7 Jan 2026 13:01:52 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.169]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C0F8719560A2; Wed, 7 Jan 2026 13:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767790916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kubT+ovvIz8B3qKCu1Vkgo6tV5welKZjjdi75BU2CIs=; b=DtKjxH1PCnUKvDC6iYbvaIwFs41p/ZgpeMgE7MC9wooHHNzDZyNzZWW6of6PF22XxYAzYG vM43d3Ssm0huKVC1AJO8NsVCb6fj05LC37tmJ9LpUFS0oPNj9N/LhM96SJvmiLnjQ8Cnkj Yf4Rj+qORzPV61b2HgbuXtmQsERKpzE= X-MC-Unique: B3mPg5rFM2ukEAlKVxoOeA-1 X-Mimecast-MFC-AGG-ID: B3mPg5rFM2ukEAlKVxoOeA_1767790913 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 2/4] tests/docker: allow display of docker output Date: Wed, 7 Jan 2026 13:01:43 +0000 Message-ID: <20260107130145.1495219-3-berrange@redhat.com> In-Reply-To: <20260107130145.1495219-1-berrange@redhat.com> References: <20260107130145.1495219-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767790981781158500 The --quiet command is used with docker unless V=3D1 is passed to make, and as a result stdout from docker is never visible by default, making it hard to diagnose failures building / running containers. Meanwhile passing V=3D1 is undesirable as that makes the entire build system verbose. Introduce a $(DOCKER_V) make variable which is initialized from $(V) It is thus possible to display docker output without also enabling make verbose output. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/docker/Makefile.include | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7d4582b6a8..d58a280333 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -40,14 +40,14 @@ docker-qemu-src: $(DOCKER_SRC_COPY) docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command, \ DOCKER_BUILDKIT=3D1 $(RUNC) build \ - $(if $V,,--quiet) \ + $(if $(DOCKER_V),,--quiet) \ $(if $(NOCACHE),--no-cache, \ $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \ --build-arg BUILDKIT_INLINE_CACHE=3D1 \ $(if $(NOUSER),, \ --build-arg USER=3D$(USER) \ --build-arg UID=3D$(UID)) \ - -t qemu/$* - < $< $(if $V,,> /dev/null),\ + -t qemu/$* - < $< $(if $(DOCKER_V),,> /dev/null),\ "BUILD", $*) =20 # General rule for inspecting registry images. @@ -73,7 +73,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-= bootstrap.docker DEB_TYPE=3D$(DEB_TYPE) \ $(if $(DEB_URL),DEB_URL=3D$(DEB_URL),) \ $(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(DOCKER_V),,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)), \ @@ -105,16 +105,17 @@ debian-toolchain-run =3D \ $(if $(NOCACHE)$(NOFETCH), \ $(call quiet-command, \ $(DOCKER_SCRIPT) build -t qemu/$1 -f $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(DOCKER_V),,--quiet) \ + $(if $(NOCACHE),--no-cache) \ --registry $(DOCKER_REGISTRY) --extra-files \ $(DOCKER_FILES_DIR)/$1.d/build-toolchain.sh, \ "BUILD", $1), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \ + $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),,--quiet) \ qemu/$1 $(DOCKER_REGISTRY), \ "FETCH", $1) \ $(call quiet-command, \ - $(DOCKER_SCRIPT) update $(if $V,,--quiet) \ + $(DOCKER_SCRIPT) update $(if $(DOCKER_V),,--quiet) \ qemu/$1 \ $(if $(NOUSER),,--add-current-user) \ "PREPARE", $1)) @@ -231,7 +232,10 @@ docker-run: docker-qemu-src -e TARGET_LIST=3D$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ -e EXTRA_CONFIGURE_OPTS=3D"$(EXTRA_CONFIGURE_OPTS)" \ -e TEST_COMMAND=3D"$(TEST_COMMAND)" \ - -e V=3D$V -e J=3D$J -e DEBUG=3D$(DEBUG) \ + -e V=3D$V \ + -e DOCKER_V=3D$(DOCKER_V) \ + -e J=3D$J \ + -e DEBUG=3D$(DEBUG) \ -e SHOW_ENV=3D$(SHOW_ENV) \ $(if $(NOUSER),, \ -v $(DOCKER_QEMU_CACHE_DIR):$(DOCKER_QEMU_CACHE_DIR) \ --=20 2.52.0 From nobody Sat Feb 7 08:53:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767790979; cv=none; d=zohomail.com; s=zohoarc; b=K6nqHRa/8pw8hgr7Ob+yPNCc58LKWmcrYNeXZiH65eg5zm+YyDq1yHHvJbyNI799F+XbRuOgbEyERCuZHNDVFGY0rNjM53iECN6graJw5Uc9uAsPpQlM1RY1p6D73EuTtDLhhs9o66/Ep9Eoq84firxvwJIN1VCrxcLAEEsEvEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767790979; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RoPhWQ4v1iItZPPSvpdAAf5+fQ9YUtxLSXC6h6caOHY=; b=O1jOvEa0uZ76CMixfKPA+vHEFHM6eh5FAONyEbpzy+UCsC9UFJQ4KOz2/Hc9bnS+Vd/4z0UQEadEb1VQ2I7UDtuy0y1F0OmPZJBiiFS+L5Q/lNnd3RJ+TIGB1Q+wiyp/Eb44Qfk403gafy61neJHQvaP/OeV5c+nqHKsMIc+sjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767790979210652.4486822917044; Wed, 7 Jan 2026 05:02:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdTBF-00052b-DD; Wed, 07 Jan 2026 08:02:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAm-0004w0-4W for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:02:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAj-0007CF-SS for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:01:59 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-GHKHz_SmPpuTBk1PJEFQMg-1; Wed, 07 Jan 2026 08:01:55 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D3F8C19541B5; Wed, 7 Jan 2026 13:01:54 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.169]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 237B919560A2; Wed, 7 Jan 2026 13:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767790917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RoPhWQ4v1iItZPPSvpdAAf5+fQ9YUtxLSXC6h6caOHY=; b=OJX9zdGsEhootkOMUSiQaGDddpvIPfV8xcWaICjDjNghgtanXbQARdwomKCJrjiwCrlBiZ fT7FESPfs1SdC3rOU9gW5uNHJL0/6Giqjwv8Zy/QGwweL2h5Ozr8kW7bYC3/BsQU1VXwZV dtm5oKXQxKx9bC6yBoJn54SuyJndoP4= X-MC-Unique: GHKHz_SmPpuTBk1PJEFQMg-1 X-Mimecast-MFC-AGG-ID: GHKHz_SmPpuTBk1PJEFQMg_1767790914 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 3/4] gitlab: ensure docker output is always displayed in CI Date: Wed, 7 Jan 2026 13:01:44 +0000 Message-ID: <20260107130145.1495219-4-berrange@redhat.com> In-Reply-To: <20260107130145.1495219-1-berrange@redhat.com> References: <20260107130145.1495219-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767790979887158500 Set the new $(DOCKER_V) variable from the previous commit, so that any CI jobs invoking docker will show the full stdout content. This improves the ability to diagnose any build failures in CI that involve docker. For example, when a 'docker build' command fails, it lets us see which command in the Dockerfile failed and why. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- .gitlab-ci.d/base.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 921c562000..7640a1d52c 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -28,6 +28,9 @@ variables: # we don't need. The --filter options avoid blobs and tree references = we aren't going to use # and we also avoid fetching tags. GIT_FETCH_EXTRA_FLAGS: --filter=3Dblob:none --filter=3Dtree:0 --no-tag= s --prune --quiet + # Ensure docker.py / tests/docker/Makefile.include always displays std= out + # from any docker commands to aid debugging of failures + DOCKER_V: 1 =20 interruptible: true =20 --=20 2.52.0 From nobody Sat Feb 7 08:53:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767790980; cv=none; d=zohomail.com; s=zohoarc; b=EayRtJCS/QVMfAAPKtltwwzxeSpRHf7K7ZlPV7BHecxNI2WSNneje33TqX4PRlgBRG+HmSvLE1bDGv0Zq/4JPk+6BaF+/49vx7mQTtpXbFBhuCDiSoQaXoE7lNDQRIX3dEr7ikueNGresz51ml3RTabUzVp8CfTR8gf3Wl71AB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767790980; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=q4Uz4rRm9B/EE4B8XQ5L8GzOl07s7UZfL8UdwPhSerg=; b=NdNfnNJ6jBj/4dcu4ZHO0qblbaHed4sQl0Wb3dE6M2onjC0ucDSqsJJFWeYhGWzdQZehpInqH+YF3AySV2TncSassDgjAIB+aSdHA4ZaJkl1rvaOHNyp6ZyAjYjG6svmAS2mE+2Rd1/l6y0h+gs0tHg+Oz0V9Mn1WVKiYoMumqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767790980766565.2388477771259; Wed, 7 Jan 2026 05:03:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdTBH-00053v-97; Wed, 07 Jan 2026 08:02:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAq-0004xl-2H for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:02:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTAo-0007Ci-3x for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:02:03 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-466-1QwNuJ4gM-iumeBsmtQngA-1; Wed, 07 Jan 2026 08:01:58 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0A8FF1956095; Wed, 7 Jan 2026 13:01:57 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.169]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6092B19560A2; Wed, 7 Jan 2026 13:01:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767790921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q4Uz4rRm9B/EE4B8XQ5L8GzOl07s7UZfL8UdwPhSerg=; b=jSyp+1PAwcnbxm8nqwlomrveMUgMdeXNwCqvVhxbQWVbx/x/IxHnWAfNpFZvaHJsQgSM/v 0fCbAom+RUEuPeiqdceo9K4EzprX4vl8an3mRXL9FeCKDad9zON2ac7cUSAGrHrhzHRlYJ 2XKU+DZS1ZSIkF+M+rlMeBUEWaRN/H4= X-MC-Unique: 1QwNuJ4gM-iumeBsmtQngA-1 X-Mimecast-MFC-AGG-ID: 1QwNuJ4gM-iumeBsmtQngA_1767790917 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 4/4] tests/docker: add support for podman remote access Date: Wed, 7 Jan 2026 13:01:45 +0000 Message-ID: <20260107130145.1495219-5-berrange@redhat.com> In-Reply-To: <20260107130145.1495219-1-berrange@redhat.com> References: <20260107130145.1495219-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767790981829158500 When a developer's environment is already within a podman container it is not possible to use 'podman' again to create containers. It will usually result in wierd errors such as: Error: fatal error, invalid internal status, unable to create a new pause= process: cannot re-exec process to join the existing user namespace. Try r= unning "podman system migrate" and if that doesn't work reboot to recover Podman offers the ability to talk to a daemon outside the container, however, which could be leveraged by QEMU. This can be used by invoking "podman --remote", or equivalently the separate "podman-remote" binary: https://github.com/containers/podman/blob/main/docs/tutorials/remote_clie= nt.md The current 'podman version' check is insufficient to detect the inability to launch containers, so it is replaced with the stronger 'podman info' check. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/docker/docker.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index ff68c7bf6f..9e18b984f4 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -76,14 +76,16 @@ def _guess_engine_command(): commands =3D [] =20 if USE_ENGINE in [EngineEnum.AUTO, EngineEnum.PODMAN]: - commands +=3D [["podman"]] + commands +=3D [["podman"], ["podman-remote"], ["podman", "--remote= "]] if USE_ENGINE in [EngineEnum.AUTO, EngineEnum.DOCKER]: commands +=3D [["docker"], ["sudo", "-n", "docker"]] for cmd in commands: try: - # docker version will return the client details in stdout - # but still report a status of 1 if it can't contact the daemon - if subprocess.call(cmd + ["version"], + # 'version' is not sufficient to prove a working binary + # for podman. 'info' is a stronger check that is more + # likely to correlate with ability to create containers, + # and required to detect the need for podman remote + if subprocess.call(cmd + ["info"], stdout=3DDEVNULL, stderr=3DDEVNULL) =3D=3D = 0: return cmd except OSError: --=20 2.52.0