From patchwork Thu May 16 08:40:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 13665863 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 AA6AFC25B74 for ; Thu, 16 May 2024 08:41:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7Wg2-0004Rg-0J; Thu, 16 May 2024 04:41:26 -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 1s7Wfn-0003qp-5L for qemu-devel@nongnu.org; Thu, 16 May 2024 04:41:14 -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 1s7Wfi-0003fo-OV for qemu-devel@nongnu.org; Thu, 16 May 2024 04:41:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715848865; 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; bh=epG0+LUIUQ8TmX7txzlhO27bJN74XDeFNmvckDjHEVU=; b=YufrCZ/+H0C6La5KyfbvdIVtHVY78+Q553bWl3q/E7UloYxgZ0q9iS7djnGGHP4nRPL3/W u0o78EkRsje/vSMTq4EUMCdT8G18zFeZKKJanlJTOL0R9iaoO3Op6Mue/ftVDt/cdTZV8O 1YNcmGhACRpOFk/JvnUue1NAtmFSwtM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-574-BIuqd-yKMP-C6VEmKKSzFw-1; Thu, 16 May 2024 04:41:01 -0400 X-MC-Unique: BIuqd-yKMP-C6VEmKKSzFw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 349DC800074; Thu, 16 May 2024 08:41:01 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 530512026D68; Thu, 16 May 2024 08:41:00 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 0/5] tests: Remove xfsprogs and g++ from the dockerfiles Date: Thu, 16 May 2024 10:40:54 +0200 Message-ID: <20240516084059.511463-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.935, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The xfsprogs package is not necessary anymore since commit a5730b8bd3 and we don't need g++ in any of the containers (except for the mingw cross compiler container which can be handled differently), so this patch series simplifies the dockerfiles a little bit accordingly. v2: - Include the "Treat the output of lcitool as text" patch (suggestion by Daniel) - Handle the g++ in the fedora-win64-cross container via a separate file in tests/lcitool/projects instead of a hack in the refresh script PS: I originally wanted to include an update to the libvirt-ci submodule in this series to be able to add the mingw-w64-tools package, too, but that would require an update of the Fedora 38 containers to a newer version - and this is causing lots of unresolved problems like failures in the fuzzer or avocado jobs, so this has to be postponed until these other issues are resolved. Philippe Mathieu-Daudé (1): tests/lcitool: Remove 'xfsprogs' from QEMU Thomas Huth (4): tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes tests/lcitool: Remove g++ from the containers (except for the MinGW one) tests/lcitool/projects/qemu.yml: Sort entries alphabetically again tests/docker/dockerfiles: Update container files with "lcitool-refresh" tests/docker/dockerfiles/alpine.docker | 4 ---- tests/docker/dockerfiles/centos9.docker | 4 ---- .../dockerfiles/debian-amd64-cross.docker | 4 ---- .../dockerfiles/debian-arm64-cross.docker | 4 ---- .../dockerfiles/debian-armel-cross.docker | 4 ---- .../dockerfiles/debian-armhf-cross.docker | 4 ---- .../dockerfiles/debian-i686-cross.docker | 4 ---- .../dockerfiles/debian-mips64el-cross.docker | 4 ---- .../dockerfiles/debian-mipsel-cross.docker | 4 ---- .../dockerfiles/debian-ppc64el-cross.docker | 4 ---- .../dockerfiles/debian-riscv64-cross.docker | 3 --- .../dockerfiles/debian-s390x-cross.docker | 4 ---- tests/docker/dockerfiles/debian.docker | 4 ---- .../dockerfiles/fedora-win64-cross.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 4 ---- tests/docker/dockerfiles/opensuse-leap.docker | 4 ---- tests/docker/dockerfiles/ubuntu2204.docker | 4 ---- tests/lcitool/projects/qemu-minimal.yml | 1 - tests/lcitool/projects/qemu-win-installer.yml | 4 ++++ tests/lcitool/projects/qemu.yml | 18 ++++++++---------- tests/lcitool/refresh | 5 +++-- 21 files changed, 16 insertions(+), 77 deletions(-) create mode 100644 tests/lcitool/projects/qemu-win-installer.yml