From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: "Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PATCH 2/5] tests/lcitool: Bump to latest libvirt-ci and update Fedora and Alpine version
Date: Sat, 1 Jun 2024 09:05:40 +0200 [thread overview]
Message-ID: <20240601070543.37786-3-thuth@redhat.com> (raw)
In-Reply-To: <20240601070543.37786-1-thuth@redhat.com>
Update to the latest version of lcitool. It dropped support for Fedora 38
and Alpine 3.18, so we have to update these to newer versions here, too.
Python 3.12 dropped the "imp" module which we still need for running
Avocado. Fortunately Fedora 40 still ships with a work-around package
that we can use until somebody updates our Avocado to a newer version.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/projects/qemu.yml | 1 +
tests/lcitool/refresh | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index cec6703971..0e9490cebc 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit cec67039719becbfbab866f9c23574f389cf9559
+Subproject commit 0e9490cebc726ef772b6c9e27dac32e7ae99f9b2
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 7511ec7ccb..070d7f4706 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -89,6 +89,7 @@ packages:
- pkg-config
- pulseaudio
- python3
+ - python3-imp
- python3-numpy
- python3-opencv
- python3-pillow
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 789acefb75..9d8e9c6a4a 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-319")
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-",
--
2.45.1
next prev parent reply other threads:[~2024-06-01 7:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-01 7:05 [PATCH 0/5] tests: Update Fedora and Alpine containers via lcitool Thomas Huth
2024-06-01 7:05 ` [PATCH 1/5] tests/lcitool: Delete obsolete centos-stream-8.yml file Thomas Huth
2024-06-03 9:32 ` Daniel P. Berrangé
2024-06-01 7:05 ` Thomas Huth [this message]
2024-06-03 9:32 ` [PATCH 2/5] tests/lcitool: Bump to latest libvirt-ci and update Fedora and Alpine version Daniel P. Berrangé
2024-06-01 7:05 ` [PATCH 3/5] .gitlab-ci.d/buildtest.yml: Use -fno-sanitize=function in the clang-system job Thomas Huth
2024-06-03 9:34 ` Daniel P. Berrangé
2024-06-01 7:05 ` [PATCH 4/5] tests/lcitool: Install mingw-w64-tools for the Windows cross-builds Thomas Huth
2024-06-03 9:34 ` Daniel P. Berrangé
2024-06-03 11:20 ` Philippe Mathieu-Daudé
2024-06-01 7:05 ` [PATCH 5/5] tests/docker/dockerfiles: Run lcitool-refresh to update Fedora and Alpine Thomas Huth
2024-06-03 9:35 ` Daniel P. Berrangé
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=20240601070543.37786-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).