.gitlab-ci.d/container-cross.yml | 4 ++++ .../dockerfiles/debian-mips64el-cross.docker | 18 ++++---------- tests/lcitool/mappings.yml | 24 +++++++++++++++++++ tests/lcitool/refresh | 2 +- 4 files changed, 33 insertions(+), 15 deletions(-)
From: Alex Bennée <alex.bennee@linaro.org>
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 and 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]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
v3: Disable packages via lcitool's mappings.yml and add bugs.debian.org URLs
.gitlab-ci.d/container-cross.yml | 4 ++++
.../dockerfiles/debian-mips64el-cross.docker | 18 ++++----------
tests/lcitool/mappings.yml | 24 +++++++++++++++++++
tests/lcitool/refresh | 2 +-
4 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 34c0e729ad..4fdd0b2e77 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -49,6 +49,10 @@ 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
+ # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535
+ 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..bfa96cb507 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"
@@ -97,17 +94,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libcmocka-dev:mips64el \
libcurl4-gnutls-dev:mips64el \
libdaxctl-dev:mips64el \
- libdrm-dev:mips64el \
- libepoxy-dev:mips64el \
libfdt-dev:mips64el \
libffi-dev:mips64el \
libfuse3-dev:mips64el \
- libgbm-dev:mips64el \
libgcrypt20-dev:mips64el \
libglib2.0-dev:mips64el \
libglusterfs-dev:mips64el \
libgnutls28-dev:mips64el \
- libgtk-3-dev:mips64el \
libibverbs-dev:mips64el \
libiscsi-dev:mips64el \
libjemalloc-dev:mips64el \
@@ -126,8 +119,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
librbd-dev:mips64el \
librdmacm-dev:mips64el \
libsasl2-dev:mips64el \
- libsdl2-dev:mips64el \
- libsdl2-image-dev:mips64el \
libseccomp-dev:mips64el \
libselinux1-dev:mips64el \
libslirp-dev:mips64el \
@@ -141,8 +132,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libusb-1.0-0-dev:mips64el \
libusbredirhost-dev:mips64el \
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/mappings.yml b/tests/lcitool/mappings.yml
index 03b974ad02..33bb01a97a 100644
--- a/tests/lcitool/mappings.yml
+++ b/tests/lcitool/mappings.yml
@@ -2,6 +2,18 @@ mappings:
flake8:
OpenSUSELeap15:
+ gtk3:
+ mips64el-deb:
+
+ libdrm:
+ mips64el-deb:
+
+ libepoxy:
+ mips64el-deb:
+
+ mesa-libgbm:
+ mips64el-deb:
+
meson:
OpenSUSELeap15:
@@ -60,6 +72,18 @@ mappings:
python3-wheel:
OpenSUSELeap15: python311-pip
+ sdl2:
+ mips64el-deb:
+
+ sdl2-image:
+ mips64el-deb:
+
+ virglrenderer:
+ mips64el-deb:
+
+ vte:
+ mips64el-deb:
+
pypi_mappings:
# Request more recent version
meson:
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.46.1
On Tue, Oct 01, 2024 at 02:32:47PM +0200, Thomas Huth wrote:
> From: Alex Bennée <alex.bennee@linaro.org>
>
> 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 and 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]
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> v3: Disable packages via lcitool's mappings.yml and add bugs.debian.org URLs
>
> .gitlab-ci.d/container-cross.yml | 4 ++++
> .../dockerfiles/debian-mips64el-cross.docker | 18 ++++----------
> tests/lcitool/mappings.yml | 24 +++++++++++++++++++
> tests/lcitool/refresh | 2 +-
> 4 files changed, 33 insertions(+), 15 deletions(-)
>
> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
> index 34c0e729ad..4fdd0b2e77 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -49,6 +49,10 @@ 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
> + # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535
> + allow_failure: true
Since you have removed these packages in the mappings,
the container build shoud now work, making this piece
redundant surely ?
> 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..bfa96cb507 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"
> @@ -97,17 +94,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> libcmocka-dev:mips64el \
> libcurl4-gnutls-dev:mips64el \
> libdaxctl-dev:mips64el \
> - libdrm-dev:mips64el \
> - libepoxy-dev:mips64el \
> libfdt-dev:mips64el \
> libffi-dev:mips64el \
> libfuse3-dev:mips64el \
> - libgbm-dev:mips64el \
> libgcrypt20-dev:mips64el \
> libglib2.0-dev:mips64el \
> libglusterfs-dev:mips64el \
> libgnutls28-dev:mips64el \
> - libgtk-3-dev:mips64el \
> libibverbs-dev:mips64el \
> libiscsi-dev:mips64el \
> libjemalloc-dev:mips64el \
> @@ -126,8 +119,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> librbd-dev:mips64el \
> librdmacm-dev:mips64el \
> libsasl2-dev:mips64el \
> - libsdl2-dev:mips64el \
> - libsdl2-image-dev:mips64el \
> libseccomp-dev:mips64el \
> libselinux1-dev:mips64el \
> libslirp-dev:mips64el \
> @@ -141,8 +132,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> libusb-1.0-0-dev:mips64el \
> libusbredirhost-dev:mips64el \
> 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/mappings.yml b/tests/lcitool/mappings.yml
> index 03b974ad02..33bb01a97a 100644
> --- a/tests/lcitool/mappings.yml
> +++ b/tests/lcitool/mappings.yml
> @@ -2,6 +2,18 @@ mappings:
> flake8:
> OpenSUSELeap15:
>
> + gtk3:
> + mips64el-deb:
> +
> + libdrm:
> + mips64el-deb:
> +
> + libepoxy:
> + mips64el-deb:
> +
> + mesa-libgbm:
> + mips64el-deb:
> +
> meson:
> OpenSUSELeap15:
>
> @@ -60,6 +72,18 @@ mappings:
> python3-wheel:
> OpenSUSELeap15: python311-pip
>
> + sdl2:
> + mips64el-deb:
> +
> + sdl2-image:
> + mips64el-deb:
> +
> + virglrenderer:
> + mips64el-deb:
> +
> + vte:
> + mips64el-deb:
> +
> pypi_mappings:
> # Request more recent version
> meson:
> 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.46.1
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 01/10/2024 16.47, Daniel P. Berrangé wrote: > On Tue, Oct 01, 2024 at 02:32:47PM +0200, Thomas Huth wrote: >> From: Alex Bennée <alex.bennee@linaro.org> >> >> 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 and 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] >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> v3: Disable packages via lcitool's mappings.yml and add bugs.debian.org URLs >> >> .gitlab-ci.d/container-cross.yml | 4 ++++ >> .../dockerfiles/debian-mips64el-cross.docker | 18 ++++---------- >> tests/lcitool/mappings.yml | 24 +++++++++++++++++++ >> tests/lcitool/refresh | 2 +- >> 4 files changed, 33 insertions(+), 15 deletions(-) >> >> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml >> index 34c0e729ad..4fdd0b2e77 100644 >> --- a/.gitlab-ci.d/container-cross.yml >> +++ b/.gitlab-ci.d/container-cross.yml >> @@ -49,6 +49,10 @@ 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 >> + # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535 >> + allow_failure: true > > Since you have removed these packages in the mappings, > the container build shoud now work, making this piece > redundant surely ? Yes, let's hope that there won't be any other breakages with this target in the near future, then it should be fine to drop this hunk. I'll send a v4. Thomas
© 2016 - 2024 Red Hat, Inc.