Browse Source

tests/lcitool: Bump to latest libvirt-ci and update Fedora and Alpine version

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>
Message-Id: <20240601070543.37786-3-thuth@redhat.com>
[AJB: regen on rebase]
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240603175328.3823123-10-alex.bennee@linaro.org>
pull/267/head
Thomas Huth 2 years ago
committed by Alex Bennée
parent
commit
06f3330bb0
  1. 4
      tests/docker/dockerfiles/alpine.docker
  2. 5
      tests/docker/dockerfiles/fedora-win64-cross.docker
  3. 5
      tests/docker/dockerfiles/fedora.docker
  4. 2
      tests/lcitool/libvirt-ci
  5. 1
      tests/lcitool/projects/qemu.yml
  6. 6
      tests/lcitool/refresh

4
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-319 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/alpine:3.18
FROM docker.io/library/alpine:3.19
RUN apk update && \
apk upgrade && \

5
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\
@ -51,6 +51,7 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-pip \
python3-sphinx \
python3-sphinx_rtd_theme \
python3-zombie-imp \
sed \
socat \
sparse \

5
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\
@ -110,6 +110,7 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-pip \
python3-sphinx \
python3-sphinx_rtd_theme \
python3-zombie-imp \
rdma-core-devel \
sed \
snappy-devel \

2
tests/lcitool/libvirt-ci

@ -1 +1 @@
Subproject commit cec67039719becbfbab866f9c23574f389cf9559
Subproject commit 0e9490cebc726ef772b6c9e27dac32e7ae99f9b2

1
tests/lcitool/projects/qemu.yml

@ -89,6 +89,7 @@ packages:
- pkg-config
- pulseaudio
- python3
- python3-imp
- python3-numpy
- python3-opencv
- python3-pillow

6
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-",

Loading…
Cancel
Save