ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: update most Debian images to Bookworm 

Bookworm has been out a while now. Time to update our containers to
the current stable. This requires the latest lcitool repo so update
the sub-module too.

For some reason the MIPs containers won't build so skip those for now.
We also have to skip the armel builds due to a stuck libc update.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-2-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2023-09-14 16:54:14 +01:00
parent 4907644841
commit ca9cde57ab
8 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/docker/dockerfiles/debian-amd64-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-11 qemu # $ lcitool dockerfile --layers all --cross-arch x86_64 debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales dpkg-reconfigure locales
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
@ -146,6 +142,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:amd64 \ libvdeplug-dev:amd64 \
libvirglrenderer-dev:amd64 \ libvirglrenderer-dev:amd64 \
libvte-2.91-dev:amd64 \ libvte-2.91-dev:amd64 \
libxdp-dev:amd64 \
libxen-dev:amd64 \ libxen-dev:amd64 \
libzstd-dev:amd64 \ libzstd-dev:amd64 \
nettle-dev:amd64 \ nettle-dev:amd64 \

9
tests/docker/dockerfiles/debian-amd64.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all debian-11 qemu # $ lcitool dockerfile --layers all debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -97,6 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev \ libvdeplug-dev \
libvirglrenderer-dev \ libvirglrenderer-dev \
libvte-2.91-dev \ libvte-2.91-dev \
libxdp-dev \
libxen-dev \ libxen-dev \
libzstd-dev \ libzstd-dev \
llvm \ llvm \
@ -115,11 +116,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
@ -145,8 +144,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"

9
tests/docker/dockerfiles/debian-arm64-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-11 qemu # $ lcitool dockerfile --layers all --cross-arch aarch64 debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales dpkg-reconfigure locales
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
@ -145,6 +141,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:arm64 \ libvdeplug-dev:arm64 \
libvirglrenderer-dev:arm64 \ libvirglrenderer-dev:arm64 \
libvte-2.91-dev:arm64 \ libvte-2.91-dev:arm64 \
libxdp-dev:arm64 \
libxen-dev:arm64 \ libxen-dev:arm64 \
libzstd-dev:arm64 \ libzstd-dev:arm64 \
nettle-dev:arm64 \ nettle-dev:arm64 \

9
tests/docker/dockerfiles/debian-armhf-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross-arch armv7l debian-11 qemu # $ lcitool dockerfile --layers all --cross-arch armv7l debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales dpkg-reconfigure locales
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
@ -145,6 +141,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:armhf \ libvdeplug-dev:armhf \
libvirglrenderer-dev:armhf \ libvirglrenderer-dev:armhf \
libvte-2.91-dev:armhf \ libvte-2.91-dev:armhf \
libxdp-dev:armhf \
libxen-dev:armhf \ libxen-dev:armhf \
libzstd-dev:armhf \ libzstd-dev:armhf \
nettle-dev:armhf \ nettle-dev:armhf \

9
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-11 qemu # $ lcitool dockerfile --layers all --cross-arch ppc64le debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales dpkg-reconfigure locales
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
@ -145,6 +141,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:ppc64el \ libvdeplug-dev:ppc64el \
libvirglrenderer-dev:ppc64el \ libvirglrenderer-dev:ppc64el \
libvte-2.91-dev:ppc64el \ libvte-2.91-dev:ppc64el \
libxdp-dev:ppc64el \
libzstd-dev:ppc64el \ libzstd-dev:ppc64el \
nettle-dev:ppc64el \ nettle-dev:ppc64el \
systemtap-sdt-dev:ppc64el \ systemtap-sdt-dev:ppc64el \

9
tests/docker/dockerfiles/debian-s390x-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross-arch s390x debian-11 qemu # $ lcitool dockerfile --layers all --cross-arch s390x debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales dpkg-reconfigure locales
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
@ -144,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:s390x \ libvdeplug-dev:s390x \
libvirglrenderer-dev:s390x \ libvirglrenderer-dev:s390x \
libvte-2.91-dev:s390x \ libvte-2.91-dev:s390x \
libxdp-dev:s390x \
libzstd-dev:s390x \ libzstd-dev:s390x \
nettle-dev:s390x \ nettle-dev:s390x \
systemtap-sdt-dev:s390x \ systemtap-sdt-dev:s390x \

2
tests/lcitool/libvirt-ci

@ -1 +1 @@
Subproject commit 5f84a21881577a5fb56cc956f6fe4e2abd6fcff0 Subproject commit e3ed1e5da101943e53d8d89424e17b22120743f5

17
tests/lcitool/refresh
View File

@ -93,7 +93,7 @@ def generate_pkglist(vm, target):
# Netmap still needs to be manually built as it is yet to be packaged # Netmap still needs to be manually built as it is yet to be packaged
# into a distro. We also add cscope and gtags which are used in the CI # into a distro. We also add cscope and gtags which are used in the CI
# test # test
debian11_extras = [ debian12_extras = [
"# netmap/cscope/global\n", "# netmap/cscope/global\n",
"RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n", "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
" apt install -y --no-install-recommends \\\n", " apt install -y --no-install-recommends \\\n",
@ -123,8 +123,8 @@ try:
# #
generate_dockerfile("alpine", "alpine-318") generate_dockerfile("alpine", "alpine-318")
generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("centos8", "centos-stream-8")
generate_dockerfile("debian-amd64", "debian-11", generate_dockerfile("debian-amd64", "debian-12",
trailer="".join(debian11_extras)) trailer="".join(debian12_extras))
generate_dockerfile("fedora", "fedora-38") generate_dockerfile("fedora", "fedora-38")
generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("opensuse-leap", "opensuse-leap-15")
generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2004", "ubuntu-2004")
@ -133,24 +133,25 @@ try:
# #
# Cross compiling builds # Cross compiling builds
# #
generate_dockerfile("debian-amd64-cross", "debian-11", generate_dockerfile("debian-amd64-cross", "debian-12",
cross="x86_64", cross="x86_64",
trailer=cross_build("x86_64-linux-gnu-", trailer=cross_build("x86_64-linux-gnu-",
"x86_64-softmmu," "x86_64-softmmu,"
"x86_64-linux-user," "x86_64-linux-user,"
"i386-softmmu,i386-linux-user")) "i386-softmmu,i386-linux-user"))
generate_dockerfile("debian-arm64-cross", "debian-11", generate_dockerfile("debian-arm64-cross", "debian-12",
cross="aarch64", cross="aarch64",
trailer=cross_build("aarch64-linux-gnu-", trailer=cross_build("aarch64-linux-gnu-",
"aarch64-softmmu,aarch64-linux-user")) "aarch64-softmmu,aarch64-linux-user"))
# migration to bookworm stalled: https://lists.debian.org/debian-arm/2023/09/msg00006.html
generate_dockerfile("debian-armel-cross", "debian-11", generate_dockerfile("debian-armel-cross", "debian-11",
cross="armv6l", cross="armv6l",
trailer=cross_build("arm-linux-gnueabi-", trailer=cross_build("arm-linux-gnueabi-",
"arm-softmmu,arm-linux-user,armeb-linux-user")) "arm-softmmu,arm-linux-user,armeb-linux-user"))
generate_dockerfile("debian-armhf-cross", "debian-11", generate_dockerfile("debian-armhf-cross", "debian-12",
cross="armv7l", cross="armv7l",
trailer=cross_build("arm-linux-gnueabihf-", trailer=cross_build("arm-linux-gnueabihf-",
"arm-softmmu,arm-linux-user")) "arm-softmmu,arm-linux-user"))
@ -165,7 +166,7 @@ try:
trailer=cross_build("mipsel-linux-gnu-", trailer=cross_build("mipsel-linux-gnu-",
"mipsel-softmmu,mipsel-linux-user")) "mipsel-softmmu,mipsel-linux-user"))
generate_dockerfile("debian-ppc64el-cross", "debian-11", generate_dockerfile("debian-ppc64el-cross", "debian-12",
cross="ppc64le", cross="ppc64le",
trailer=cross_build("powerpc64le-linux-gnu-", trailer=cross_build("powerpc64le-linux-gnu-",
"ppc64-softmmu,ppc64-linux-user")) "ppc64-softmmu,ppc64-linux-user"))
@ -176,7 +177,7 @@ try:
trailer=cross_build("riscv64-linux-gnu-", trailer=cross_build("riscv64-linux-gnu-",
"riscv64-softmmu,riscv64-linux-user")) "riscv64-softmmu,riscv64-linux-user"))
generate_dockerfile("debian-s390x-cross", "debian-11", generate_dockerfile("debian-s390x-cross", "debian-12",
cross="s390x", cross="s390x",
trailer=cross_build("s390x-linux-gnu-", trailer=cross_build("s390x-linux-gnu-",
"s390x-softmmu,s390x-linux-user")) "s390x-softmmu,s390x-linux-user"))