From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 647E5CE7A9A for ; Mon, 25 Sep 2023 16:09:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qko91-0000jt-LC; Mon, 25 Sep 2023 12:09:12 -0400 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 1qko8x-0000jI-4h for qemu-devel@nongnu.org; Mon, 25 Sep 2023 12:09:07 -0400 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 1qko8v-0007nH-K4 for qemu-devel@nongnu.org; Mon, 25 Sep 2023 12:09:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695658144; 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=3o09FgjP2mri3S7JGXJqW1njdmzYkmcoW/evXL5zVCg=; b=biiIwv9BS15mpmMh23aqdIdmA4wusamYgkrMvbRGFP4M9Pzzx6kV/Ow6NfT8J7ZOGaniUS ioL42XFNfc+UQz+pgicpfrEvyowLqZpHyBZ5lBU55zt+7bwY8uL/Ih+n0GY8x8ufoW2YZj SxxpiaezWG54x5MnFvWGMB5tZjNt63Y= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-z646pBzKP4i8K7G88YOHsw-1; Mon, 25 Sep 2023 12:09:03 -0400 X-MC-Unique: z646pBzKP4i8K7G88YOHsw-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-32001e60fb3so4060919f8f.1 for ; Mon, 25 Sep 2023 09:09:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695658142; x=1696262942; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3o09FgjP2mri3S7JGXJqW1njdmzYkmcoW/evXL5zVCg=; b=RCKuMg6HX4O8AvpSjdDYndCx1nVj279XhWEjq8RUPrM+uHL52uOg+gJeLAOwxb3sGA 3/9xpEEro3oTnQOq2+nPWvpJ+ZQ35ShyOUYn/mk4kHieZoKLuazOscKf7MdeK9ULzDpu ostgF4b0mx8RFLlt4i72usjQGaMwU9nPK/d4WiCkwJaTnxCoScO5/2StmF/qc0IXrdh8 Bzzh29j5q2wOJYfQ2R4tZSZ4p9APFfyFHXbURv2Uox2C1pE3gDy5768x7m1GPmMPJtf3 y5846LbIzeIcUtmI3TW8PgtQI1GD/d4AGL7PVgArEpm6hd7wjTVmee5L/m7d2o0fig0/ l4kw== X-Gm-Message-State: AOJu0Yxlnnm4ovM9T6VpeeDe06mB+qS0wKbvYpmHl6iHng50IQXXkGTD F9cr64fIs3zFyGdQQk4QyTaSO6vQDsJ4TpgPGOEZezfmRW33Lplw6lEwZa+9Mg7ufEzK3OLCKWC yOZn+hFbGSlB+36U= X-Received: by 2002:adf:f583:0:b0:317:6734:c2ae with SMTP id f3-20020adff583000000b003176734c2aemr67826wro.11.1695658142083; Mon, 25 Sep 2023 09:09:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFUpWxAiwheBf6zPNa+xiHCBgnt/6MLcrkQ/lGgH52gcNq1HepKsz8F773I/BgWVVKNVPZj8Q== X-Received: by 2002:adf:f583:0:b0:317:6734:c2ae with SMTP id f3-20020adff583000000b003176734c2aemr67780wro.11.1695658141713; Mon, 25 Sep 2023 09:09:01 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:9af8:e5f5:7516:fa89? ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.googlemail.com with ESMTPSA id 19-20020a05600c229300b00405953973c3sm1928585wmf.6.2023.09.25.09.08.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 25 Sep 2023 09:09:00 -0700 (PDT) Message-ID: Date: Mon, 25 Sep 2023 18:08:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 05/31] tests/docker: make docker engine choice entirely configure driven Content-Language: en-US To: =?UTF-8?Q?Alex_Benn=c3=a9e?= , qemu-devel@nongnu.org Cc: Alistair Francis , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Marcin Juszkiewicz , John Snow , libvir-list@redhat.com, =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , qemu-s390x@nongnu.org, Song Gao , Daniel Henrique Barboza , Marcel Apfelbaum , Bastian Koppelmann , Liu Zhiwei , Weiwei Li , Nicholas Piggin , Radoslaw Biernacki , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Eduardo Habkost , Cleber Rosa , Mahmoud Mandour , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Thomas Huth , Wainer dos Santos Moschetta , Richard Henderson , Bin Meng , Alexandre Iooss , Xiaojuan Yang , qemu-ppc@nongnu.org, David Hildenbrand , Yanan Wang , Peter Maydell , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Palmer Dabbelt , Ilya Leoshkevich , Laurent Vivier , Yoshinori Sato , Leif Lindholm , Beraldo Leal References: <20230925144854.1872513-1-alex.bennee@linaro.org> <20230925144854.1872513-6-alex.bennee@linaro.org> From: Paolo Bonzini In-Reply-To: <20230925144854.1872513-6-alex.bennee@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 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, NICE_REPLY_A=-1.473, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 9/25/23 16:48, Alex Bennée wrote: > Since 0b1a649047 (tests/docker: use direct RUNC call to build > containers) we ended up with the potential for the remaining docker.py > script calls to deviate from the direct RUNC calls. Fix this by > dropping the use of ENGINE in the makefile and rely entirely on what > we detect at configure time. > > Signed-off-by: Alex Bennée > --- > configure | 1 - > tests/docker/Makefile.include | 7 ++----- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/configure b/configure > index e08127045d..707132a3ae 100755 > --- a/configure > +++ b/configure > @@ -1694,7 +1694,6 @@ if test -n "$gdb_bin"; then > fi > > if test "$container" != no; then > - echo "ENGINE=$container" >> $config_host_mak > echo "RUNC=$runc" >> $config_host_mak > fi > echo "SUBDIRS=$subdirs" >> $config_host_mak > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index dfabafab92..035d272be9 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -17,8 +17,7 @@ endif > DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) > > RUNC ?= docker > -ENGINE ?= auto This was used when using docker-* from the source directory. What about changing it to: RUNC ?= $(if $(shell command -v docker), docker, podman) No complaint on removing ENGINE= though. Paolo > -DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) > +DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(RUNC) > > CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) > DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) > @@ -158,7 +157,7 @@ $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ > ) > > docker: > - @echo 'Build QEMU and run tests inside Docker or Podman containers' > + @echo 'Build QEMU and run tests inside $(RUNC) containers' > @echo > @echo 'Available targets:' > @echo > @@ -198,8 +197,6 @@ docker: > @echo ' EXECUTABLE= Include executable in image.' > @echo ' EXTRA_FILES=" [... ]"' > @echo ' Include extra files in image.' > - @echo ' ENGINE=auto/docker/podman' > - @echo ' Specify which container engine to run.' > @echo ' REGISTRY=url Cache builds from registry (default:$(DOCKER_REGISTRY))' > > docker-help: docker