Re: [PATCH 3/3] tests/docker: Update the opensuse-leap container file to version 16

["Alex Bennée" <alex.bennee@linaro.org>]

Thomas Huth <thuth@redhat.com> writes:

> From: Thomas Huth <thuth@redhat.com>
>
> Run "make lcitool-refresh" to update the container file to the latest
> version of openSUSE.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Personally I'd merge this with the refresh update in the previous
commit. Anyway:

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/docker/dockerfiles/opensuse-leap.docker | 35 +++++++++----------
>  1 file changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
> index d693f2c6f85..66e90fa3634 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -1,13 +1,12 @@
>  # THIS FILE WAS AUTO-GENERATED
>  #
> -#  $ lcitool dockerfile --layers all opensuse-leap-15 qemu
> +#  $ lcitool dockerfile --layers all opensuse-leap-16 qemu
>  #
>  # https://gitlab.com/libvirt/libvirt-ci
>  
> -FROM registry.opensuse.org/opensuse/leap:15.6
> +FROM registry.opensuse.org/opensuse/leap:16.0
>  
>  RUN zypper update -y && \
> -    zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo && \
>      zypper install -y \
>             Mesa-devel \
>             alsa-lib-devel \
> @@ -80,13 +79,14 @@ RUN zypper update -y && \
>             libudev-devel \
>             liburing-devel \
>             libusb-1_0-devel \
> +           libxdp-devel \
>             libzstd-devel \
>             llvm \
>             lttng-ust-devel \
>             lzo-devel \
>             make \
> +           meson \
>             mtools \
> -           ncat \
>             ncurses-devel \
>             ninja \
>             openssh \
> @@ -94,11 +94,17 @@ RUN zypper update -y && \
>             pcre2-devel-static \
>             pipewire-devel \
>             pkgconfig \
> -           python311 \
> -           python311-base \
> -           python311-pip \
> -           python311-setuptools \
> -           python311-wheel \
> +           python3-Pillow \
> +           python3-PyYAML \
> +           python3-Sphinx \
> +           python3-base \
> +           python3-numpy \
> +           python3-opencv \
> +           python3-pip \
> +           python3-setuptools \
> +           python3-sphinx_rtd_theme \
> +           python3-tomli \
> +           python3-wheel \
>             rdma-core-devel \
>             rust \
>             rust-bindgen \
> @@ -110,7 +116,7 @@ RUN zypper update -y && \
>             spice-protocol-devel \
>             swtpm \
>             systemd-devel \
> -           systemtap-sdt-devel \
> +           systemtap-dtrace \
>             tar \
>             tesseract-ocr \
>             tesseract-ocr-traineddata-english \
> @@ -133,18 +139,11 @@ RUN zypper update -y && \
>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
>      ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>  
> -RUN /usr/bin/pip3.11 install \
> -                     PyYAML \
> -                     meson==1.8.1 \
> -                     pillow \
> -                     sphinx \
> -                     sphinx-rtd-theme
> -
>  ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
>  ENV LANG="en_US.UTF-8"
>  ENV MAKE="/usr/bin/make"
>  ENV NINJA="/usr/bin/ninja"
> -ENV PYTHON="/usr/bin/python3.11"
> +ENV PYTHON="/usr/bin/python3"
>  # As a final step configure the user (if env is defined)
>  ARG USER
>  ARG UID

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro