[PATCH] testing: bump mips64el cross to bookworm and allow to fail

[PATCH] testing: bump mips64el cross to bookworm and allow to fail

[Alex Bennée]

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 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 mark it as allow_fail for the time being.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Michael Tokarev <mjt@tls.msk.ru>
---
 .gitlab-ci.d/container-cross.yml                      |  3 +++
 tests/docker/dockerfiles/debian-mips64el-cross.docker | 10 ++++------
 tests/lcitool/refresh                                 |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 34c0e729ad..c567926182 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -49,6 +49,9 @@ i686-debian-cross-container:
 mips64el-debian-cross-container:
   extends: .container_job_template
   stage: containers
+  # Currently waiting for Debian to fix:
+  #  libgl1-mesa-dri:mips64el : Depends: libllvm15:mips64el but it is not going to be installed
+  allow_failure: true
   variables:
     NAME: debian-mips64el-cross
 
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 2862785692..69d6e8cd11 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -1,10 +1,10 @@
 # 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
 
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       python3-opencv \
                       python3-pillow \
                       python3-pip \
-                      python3-setuptools \
                       python3-sphinx \
                       python3-sphinx-rtd-theme \
                       python3-venv \
-                      python3-wheel \
                       python3-yaml \
                       rpm2cpio \
                       sed \
                       socat \
                       sparse \
+                      swtpm \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
@@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg-reconfigure locales && \
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
 
-RUN /usr/bin/pip3 install tomli
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
@@ -143,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libvdeplug-dev:mips64el \
                       libvirglrenderer-dev:mips64el \
                       libvte-2.91-dev:mips64el \
+                      libxdp-dev:mips64el \
                       libzstd-dev:mips64el \
                       nettle-dev:mips64el \
                       systemtap-sdt-dev:mips64el \
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 92381f3c46..a78219f7bc 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -166,7 +166,7 @@ try:
                                             "x86_64-linux-user,"
                                             "i386-softmmu,i386-linux-user"))
 
-    generate_dockerfile("debian-mips64el-cross", "debian-11",
+    generate_dockerfile("debian-mips64el-cross", "debian-12",
                         cross="mips64el",
                         trailer=cross_build("mips64el-linux-gnuabi64-",
                                             "mips64el-softmmu,mips64el-linux-user"))
-- 
2.39.5

Re: [PATCH] testing: bump mips64el cross to bookworm and allow to fail

[Thomas Huth]

On 23/09/2024 10.15, Alex Bennée wrote:
> 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 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 mark it as allow_fail for the time being.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Michael Tokarev <mjt@tls.msk.ru>
> ---
...
> @@ -143,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>                         libvdeplug-dev:mips64el \
>                         libvirglrenderer-dev:mips64el \
>                         libvte-2.91-dev:mips64el \
> +                      libxdp-dev:mips64el \
>                         libzstd-dev:mips64el \
>                         nettle-dev:mips64el \
>                         systemtap-sdt-dev:mips64el \

We could also do a temporary manual hack and remove the problematic packages 
from the list that cause the failure. I guess removing libdrm-dev:mips64el , 
libgtk-3-dev:mips64el and the SDL2 packages might help to avoid that the 
mesa stuff gets installed (which causes the trouble)...
Of course this will be overwritten the next time someone runs lcitool again, 
but with a little bit of luck, Debian already got fixed at that point in 
time. What do you think?

  Thomas

Re: [PATCH] testing: bump mips64el cross to bookworm and allow to fail

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> On 23/09/2024 10.15, Alex Bennée wrote:
>> 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 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 mark it as allow_fail for the time being.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Cc: Michael Tokarev <mjt@tls.msk.ru>
>> ---
> ...
>> @@ -143,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
>>                         libvdeplug-dev:mips64el \
>>                         libvirglrenderer-dev:mips64el \
>>                         libvte-2.91-dev:mips64el \
>> +                      libxdp-dev:mips64el \
>>                         libzstd-dev:mips64el \
>>                         nettle-dev:mips64el \
>>                         systemtap-sdt-dev:mips64el \
>
> We could also do a temporary manual hack and remove the problematic
> packages from the list that cause the failure. I guess removing
> libdrm-dev:mips64el , libgtk-3-dev:mips64el and the SDL2 packages
> might help to avoid that the mesa stuff gets installed (which causes
> the trouble)...
> Of course this will be overwritten the next time someone runs lcitool
> again, but with a little bit of luck, Debian already got fixed at that
> point in time. What do you think?

I was hoping the blockage would get cleared by now but I guess not. If
the distros no longer have enough eyeballs to care about mips64el and we
have it as Odd Fixes then I think the allow_fail approach allows us to
move forward without manual hacks.

If the CI runs and is green great, if not it doesn't hold anything up.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro