Re: [PATCH] tests: lcitool: Switch to OpenSUSE Leap 15.4

[Paolo Bonzini]

On 3/31/23 15:11, Peter Krempa wrote:
> The 15.3 version is EOL now:
>
> https://get.opensuse.org/leap/15.3
>
> Switch the dockerfile to 15.4.

As far as I know, 15.4 still has Python 3.6 as the default Python, so 
you need to rename tests/lcitool/targets/opensuse-leap-153.yml and 
adjust tests/lcitool/mappings.yml (changing the 153 in the mappings to 154).

Also, when you send a v2, please include a submodule update as well to 
commit 51dad419.

Paolo

> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>   tests/docker/dockerfiles/opensuse-leap.docker | 25 +++++++++----------
>   tests/lcitool/refresh                         |  2 +-
>   2 files changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker 
> b/tests/docker/dockerfiles/opensuse-leap.docker
> index 8e9500e443..91a67bfd0d 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -1,10 +1,10 @@
>   # THIS FILE WAS AUTO-GENERATED
>   #
> -#  $ lcitool dockerfile --layers all opensuse-leap-153 qemu
> +#  $ lcitool dockerfile --layers all opensuse-leap-154 qemu
>   #
>   # https://gitlab.com/libvirt/libvirt-ci
>
> -FROM registry.opensuse.org/opensuse/leap:15.3
> +FROM registry.opensuse.org/opensuse/leap:15.4
>
>   RUN zypper update -y && \
>       zypper install -y \
> @@ -81,6 +81,7 @@ RUN zypper update -y && \
>              lttng-ust-devel \
>              lzo-devel \
>              make \
> +           meson \
>              mkisofs \
>              ncat \
>              ncurses-devel \
> @@ -89,9 +90,14 @@ RUN zypper update -y && \
>              pam-devel \
>              pcre-devel-static \
>              pkgconfig \
> -           python39-base \
> -           python39-pip \
> -           python39-setuptools \
> +           python3-Pillow \
> +           python3-PyYAML \
> +           python3-Sphinx \
> +           python3-base \
> +           python3-numpy \
> +           python3-opencv \
> +           python3-pip \
> +           python3-sphinx_rtd_theme \
>              rdma-core-devel \
>              rpm \
>              sed \
> @@ -124,18 +130,11 @@ RUN zypper update -y && \
>       ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
>       ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>
> -RUN /usr/bin/pip3.9 install \
> -                    PyYAML \
> -                    meson==0.63.2 \
> -                    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.9"
> +ENV PYTHON "/usr/bin/python3"
>   # As a final step configure the user (if env is defined)
>   ARG USER
>   ARG UID
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index c0d7ad5516..b3acd9d6b0 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -120,7 +120,7 @@ try:
>       generate_dockerfile("debian-amd64", "debian-11",
>                           trailer="".join(debian11_extras))
>       generate_dockerfile("fedora", "fedora-37")
> -    generate_dockerfile("opensuse-leap", "opensuse-leap-153")
> +    generate_dockerfile("opensuse-leap", "opensuse-leap-154")
>       generate_dockerfile("ubuntu2004", "ubuntu-2004")
>       generate_dockerfile("ubuntu2204", "ubuntu-2204")