Procházet zdrojové kódy

testing: bump mips64el cross to bookworm and fix package list

The mips64el cross setup is very broken for bullseye which has now
entered LTS support so is unlikely to be fixed. While we still can't
build the container with all packages for bookworm due to a single
missing dependency that will hopefully get fixed in due course. For
the sake of keeping the CI green we disable the problematic packages
via the lcitool's mappings.yml file.

See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
[thuth: Disable the problematic packages via lcitool's mappings.yml]
Message-ID: <20241002080333.127172-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Alex Bennée před 10 měsíci
rodič
revize
c60473d292

+ 4 - 14
tests/docker/dockerfiles/debian-mips64el-cross.docker

@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 # THIS FILE WAS AUTO-GENERATED
 #
 #
-#  $ lcitool dockerfile --layers all --cross-arch mips64el debian-11 qemu
+#  $ lcitool dockerfile --layers all --cross-arch mips64el 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 && \
@@ -48,16 +48,15 @@ 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 \
                       socat \
                       socat \
                       sparse \
                       sparse \
+                      swtpm \
                       tar \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr \
                       tesseract-ocr-eng \
                       tesseract-ocr-eng \
@@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg-reconfigure locales && \
     dpkg-reconfigure locales && \
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
 
 
-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"
@@ -97,17 +94,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libcmocka-dev:mips64el \
                       libcmocka-dev:mips64el \
                       libcurl4-gnutls-dev:mips64el \
                       libcurl4-gnutls-dev:mips64el \
                       libdaxctl-dev:mips64el \
                       libdaxctl-dev:mips64el \
-                      libdrm-dev:mips64el \
-                      libepoxy-dev:mips64el \
                       libfdt-dev:mips64el \
                       libfdt-dev:mips64el \
                       libffi-dev:mips64el \
                       libffi-dev:mips64el \
                       libfuse3-dev:mips64el \
                       libfuse3-dev:mips64el \
-                      libgbm-dev:mips64el \
                       libgcrypt20-dev:mips64el \
                       libgcrypt20-dev:mips64el \
                       libglib2.0-dev:mips64el \
                       libglib2.0-dev:mips64el \
                       libglusterfs-dev:mips64el \
                       libglusterfs-dev:mips64el \
                       libgnutls28-dev:mips64el \
                       libgnutls28-dev:mips64el \
-                      libgtk-3-dev:mips64el \
                       libibverbs-dev:mips64el \
                       libibverbs-dev:mips64el \
                       libiscsi-dev:mips64el \
                       libiscsi-dev:mips64el \
                       libjemalloc-dev:mips64el \
                       libjemalloc-dev:mips64el \
@@ -126,8 +119,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       librbd-dev:mips64el \
                       librbd-dev:mips64el \
                       librdmacm-dev:mips64el \
                       librdmacm-dev:mips64el \
                       libsasl2-dev:mips64el \
                       libsasl2-dev:mips64el \
-                      libsdl2-dev:mips64el \
-                      libsdl2-image-dev:mips64el \
                       libseccomp-dev:mips64el \
                       libseccomp-dev:mips64el \
                       libselinux1-dev:mips64el \
                       libselinux1-dev:mips64el \
                       libslirp-dev:mips64el \
                       libslirp-dev:mips64el \
@@ -141,8 +132,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libusb-1.0-0-dev:mips64el \
                       libusb-1.0-0-dev:mips64el \
                       libusbredirhost-dev:mips64el \
                       libusbredirhost-dev:mips64el \
                       libvdeplug-dev:mips64el \
                       libvdeplug-dev:mips64el \
-                      libvirglrenderer-dev:mips64el \
-                      libvte-2.91-dev:mips64el \
+                      libxdp-dev:mips64el \
                       libzstd-dev:mips64el \
                       libzstd-dev:mips64el \
                       nettle-dev:mips64el \
                       nettle-dev:mips64el \
                       systemtap-sdt-dev:mips64el \
                       systemtap-sdt-dev:mips64el \

+ 26 - 0
tests/lcitool/mappings.yml

@@ -2,6 +2,20 @@ mappings:
   flake8:
   flake8:
     OpenSUSELeap15:
     OpenSUSELeap15:
 
 
+  # Due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535 we
+  # have to disable all packages that depend on libgl1-mesa-dri:mips64el
+  gtk3:
+    mips64el-deb:
+
+  libdrm:
+    mips64el-deb:
+
+  libepoxy:
+    mips64el-deb:
+
+  mesa-libgbm:
+    mips64el-deb:
+
   meson:
   meson:
     OpenSUSELeap15:
     OpenSUSELeap15:
 
 
@@ -60,6 +74,18 @@ mappings:
   python3-wheel:
   python3-wheel:
     OpenSUSELeap15: python311-pip
     OpenSUSELeap15: python311-pip
 
 
+  sdl2:
+    mips64el-deb:
+
+  sdl2-image:
+    mips64el-deb:
+
+  virglrenderer:
+    mips64el-deb:
+
+  vte:
+    mips64el-deb:
+
 pypi_mappings:
 pypi_mappings:
   # Request more recent version
   # Request more recent version
   meson:
   meson:

+ 1 - 1
tests/lcitool/refresh

@@ -166,7 +166,7 @@ try:
                                             "x86_64-linux-user,"
                                             "x86_64-linux-user,"
                                             "i386-softmmu,i386-linux-user"))
                                             "i386-softmmu,i386-linux-user"))
 
 
-    generate_dockerfile("debian-mips64el-cross", "debian-11",
+    generate_dockerfile("debian-mips64el-cross", "debian-12",
                         cross="mips64el",
                         cross="mips64el",
                         trailer=cross_build("mips64el-linux-gnuabi64-",
                         trailer=cross_build("mips64el-linux-gnuabi64-",
                                             "mips64el-softmmu,mips64el-linux-user"))
                                             "mips64el-softmmu,mips64el-linux-user"))