From patchwork Wed May 29 16:09:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 799859 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp813647wrz; Wed, 29 May 2024 09:11:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVPiNZ5lb2BGTx9t/xRzs75PPO48iSbvE6YWzfDmElSzCCbFlSmMUna7yO1m7GMW502LQUZ4mM8jufMyGXzDwZJ X-Google-Smtp-Source: AGHT+IH2ogOCbgXzpUlW2JFDRrh+pCMfWeXAVXaxO0PNkfk4MYhEP6dmtPpU04zDRaUGCNZk8wp6 X-Received: by 2002:a05:620a:8217:b0:792:dd2a:bae0 with SMTP id af79cd13be357-794ab1226e2mr1585207985a.75.1716999116535; Wed, 29 May 2024 09:11:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716999116; cv=none; d=google.com; s=arc-20160816; b=rZr0wumaYPwrli2n7bOPq+D8pXc8JBg8vf6gDltgUxIhtJO2vxBnnVbZyWbo+YcpJI OCl3/bbxX6nVhvyfkddGpoLRF8Vf7tlV7zJl8eCccPmqiezHPMpWo4NqAOYimfuvD0N0 wufTdRWDnxceVNjZr6QKB7KOyLhU7RPXTUQrcWaFthy/OMxC+rWyK4+NbNnr1gKagEUk rbNOfSf6w3GWnuebBc/4xUiKRtXqdzh/Ks3GHmKgUtu99FeX15ALKaQSGbFz20dKOGyu 6tS3xswKDXDprzvPKpMNxVXwJLXQ8/iqyjxsHXYmXr65cbvWASiB7s08+QthEP5/Wpxi Swuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zMVF59L9ibXy7bBTe6+ECf11kLQqf1Mdij1G/dOwXd0=; fh=73Bjh8AhN5WIZkOkggOaOI6x10w+Om+h0ZWVmgoFcNA=; b=gurB4f1JW5Nl8i33YLqISlCTh/PId4gM0pUvDINnJRF8YaSLOXNcqHaOGp4EQLnEnN 5DZWv+8M7Sgv6aaV1URWeIdui/rMMOa00KzFmocBnPRPXjuZvJfd1hE62TKEcdX8oTMy Ki6kEWjsXjpvl+zKgaIqUZbIJXJW5W1YhD8nTQrOu2iCKkKdErN7z058MIIYuC8Ip1d+ 8tntsbf8hUVvG6/FylppK9YGyr9hA6vywSKri9p0jVakGPo9q7md9tLB7YgSPu+gD/zJ uB/fZaLl3D+Hp+P3v8Qf/Q51cE4+EE97Dy7iuIzFDmmLUQUROI42d4CyhvcCadKqeLlA eLxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CtC1rMtE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-43fb16c4824si144426981cf.41.2024.05.29.09.11.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2024 09:11:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CtC1rMtE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCLsF-0000dZ-9j; Wed, 29 May 2024 12:09:59 -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 1sCLsC-0000aq-Jb for qemu-devel@nongnu.org; Wed, 29 May 2024 12:09:56 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCLrx-0003IG-P3 for qemu-devel@nongnu.org; Wed, 29 May 2024 12:09:53 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a634e03339dso279882966b.3 for ; Wed, 29 May 2024 09:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716998980; x=1717603780; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zMVF59L9ibXy7bBTe6+ECf11kLQqf1Mdij1G/dOwXd0=; b=CtC1rMtEHxCgYpgfyShq0qNLjV/xownJaHfZQfXCdO0yZd6D2IFkOS3t2qITg0OTgK RVIE/Z88yax2kJGGCH8RT5ah2Cu2BtKJIS837Sbe0yVES/pXIcbtBCPBzH0HVN8sUIeO z9NUpiFZ9NejL38OhF8whtMcIIf5m/R/P8TsbpXCkCmDB4y28oN8NVYz2ZGMHTMrg7m4 gT+K8Q/zvzcwHw/T7z4ugujaEUjDFsIdy5j9VWocGfCAMkysBRGlhI66BWHOPlBjdDyO HelbVqWgy6hDJ8ykXptyVJasj+TSfUUdrX+k7Y59YlNpvNjmdBkYplM3xpow7qcPMgQa 5CNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716998980; x=1717603780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zMVF59L9ibXy7bBTe6+ECf11kLQqf1Mdij1G/dOwXd0=; b=qDiMrRXc24hWtl6bkOI/SLQouUAlM6J5vLu9TR/JkBGXr26/YCyt8uxdT/ijcjjFbj Ra9y+CXndQCqfnxBf0b52KrQSbEHV3Sc5I2lVmILW+XsE6bb23+tJe8GmhMtmtS5gSYP w/qAbRaSOg/UJxpXToYV/OT/DqxBjUcZSVJGlo/fH1Q25/GEk1q2+PZxWW+hNAsIbE5t l11E9AlFTXIrRAhXIIFAEBmGmahpI6zr4SlcQ2lbu3WnGPzmZO4z7wKroBjgZYKudj/T QzGxFHGDqpJdVaPPWAUUljFybgceI/mf1HlumFjlYkWMOX0GzoBJ7dW+/Vt5mIqZzYN6 XLMA== X-Gm-Message-State: AOJu0Yw89CnJFO1JOml4cqiOXQB44i2VKJ1l4HCtuK9nMil25twcf7KR jVFfC5Lq0geRSvq3GwgHHRQAxbutsNYtDhuiEjp4dYJIhyiYcBffhWSsbwEVFnU= X-Received: by 2002:a17:906:adcb:b0:a62:8ee2:16c1 with SMTP id a640c23a62f3a-a628ee217f7mr816037366b.54.1716998979999; Wed, 29 May 2024 09:09:39 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a626cc500a1sm730713466b.125.2024.05.29.09.09.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 09:09:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B65815FA92; Wed, 29 May 2024 17:09:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Wainer dos Santos Moschetta , =?utf-8?q?Daniel_P=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Beraldo Leal , Thomas Huth , Richard Henderson , Leif Lindholm , John Snow , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Mark Cave-Ayland , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini , Jiaxun Yang , qemu-arm@nongnu.org, Cleber Rosa , Joel Stanley , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Marcin Juszkiewicz , Peter Maydell , qemu-s390x@nongnu.org, Radoslaw Biernacki Subject: [PATCH 07/10] tests/lcitool: bump to latest version Date: Wed, 29 May 2024 17:09:31 +0100 Message-Id: <20240529160934.982373-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240529160934.982373-1-alex.bennee@linaro.org> References: <20240529160934.982373-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We have to simultaneously update a few bits on our side as lcitool has already deprecated fedora-38, alpine-3.18 and centos-8-stream. However there is no change to the package list yet. Signed-off-by: Alex Bennée --- v2 - fix typo s/lci-tool/lcitool/ --- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 6 +++--- tests/lcitool/targets/centos-stream-8.yml | 3 --- 6 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 tests/lcitool/targets/centos-stream-8.yml diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 554464f31e..b76cc2a35e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all alpine-318 qemu +# $ lcitool dockerfile --layers all alpine-320 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.18 +FROM docker.io/library/alpine:3.20 RUN apk update && \ apk upgrade && \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 0f78711876..cce6739613 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu,qemu-win-installer +# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-40 qemu,qemu-win-installer # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:38 +FROM registry.fedoraproject.org/fedora:40 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 098c894d10..bd51e1e149 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-38 qemu +# $ lcitool dockerfile --layers all fedora-40 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:38 +FROM registry.fedoraproject.org/fedora:40 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index cec6703971..a300a26c0d 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit cec67039719becbfbab866f9c23574f389cf9559 +Subproject commit a300a26c0d7f48544c40af268b3245ebd63c7351 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 789acefb75..ace4d08364 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -124,11 +124,11 @@ try: # # Standard native builds # - generate_dockerfile("alpine", "alpine-318") + generate_dockerfile("alpine", "alpine-320") generate_dockerfile("centos9", "centos-stream-9") generate_dockerfile("debian", "debian-12", trailer="".join(debian12_extras)) - generate_dockerfile("fedora", "fedora-38") + generate_dockerfile("fedora", "fedora-40") generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2204", "ubuntu-2204") @@ -191,7 +191,7 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win64-cross", "fedora-38", + generate_dockerfile("fedora-win64-cross", "fedora-40", project='qemu,qemu-win-installer', cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", diff --git a/tests/lcitool/targets/centos-stream-8.yml b/tests/lcitool/targets/centos-stream-8.yml deleted file mode 100644 index 6b11160fd1..0000000000 --- a/tests/lcitool/targets/centos-stream-8.yml +++ /dev/null @@ -1,3 +0,0 @@ -paths: - pip3: /usr/bin/pip3.8 - python: /usr/bin/python3.8