Re: [PATCH 2/3] tests/lcitool: Update openSUSE to version 16

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

Thomas Huth <thuth@redhat.com> writes:

> From: Thomas Huth <thuth@redhat.com>
>
> The first version of openSUSE 15 has been released in 2018, and
> according to our support policy, we "support the most recent major
> version at all times for up to five years after its initial release."
>
> Since openSUSE 16 has been released a while ago, and openSUSE is
> clearly older than 5 years already, it's time to update to version 16
> now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  configure                  |  1 -
>  tests/lcitool/mappings.yml | 58 --------------------------------------
>  tests/lcitool/refresh      |  2 +-
>  3 files changed, 1 insertion(+), 60 deletions(-)
>
> diff --git a/configure b/configure
> index cd1dadd8bb2..f3603fd9160 100755
> --- a/configure
> +++ b/configure
> @@ -929,7 +929,6 @@ if ! check_py_version "$python"; then
>    error_exit "Cannot use '$python', Python >= 3.9 is required." \
>               "Use --python=/path/to/python to specify a supported Python." \
>               "Maybe try:" \
> -             "  openSUSE Leap 15.3+: zypper install python39" \
>               "  CentOS: dnf install python3.12"
>  fi
>  
> diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml
> index 60618971584..62fe60d047f 100644
> --- a/tests/lcitool/mappings.yml
> +++ b/tests/lcitool/mappings.yml
> @@ -3,70 +3,17 @@ mappings:
>    bindgen:
>      Ubuntu2204:
>  
> -  flake8:
> -    OpenSUSELeap15:
> -
>    meson:
> -    OpenSUSELeap15:
>      # Use Meson from PyPI wherever Rust is enabled
>      Debian:
>      Fedora:
>      Ubuntu:
>  
> -  python3:
> -    OpenSUSELeap15: python311-base
> -
> -  python3-PyYAML:
> -    OpenSUSELeap15:
> -
> -  python3-devel:
> -    OpenSUSELeap15: python311-devel
> -
> -  python3-docutils:
> -    OpenSUSELeap15:
> -
> -  python3-numpy:
> -    OpenSUSELeap15:
> -
> -  python3-opencv:
> -    OpenSUSELeap15:
> -
> -  python3-pillow:
> -    OpenSUSELeap15:
> -
> -  python3-pip:
> -    OpenSUSELeap15: python311-pip
> -
> -  python3-pillow:
> -    OpenSUSELeap15:
> -
> -  python3-selinux:
> -    OpenSUSELeap15:
> -
> -  python3-setuptools:
> -    OpenSUSELeap15: python311-setuptools
> -
> -  python3-sphinx:
> -    OpenSUSELeap15:
> -
> -  python3-sphinx-rtd-theme:
> -    OpenSUSELeap15:
> -
> -  python3-sqlite3:
> -    OpenSUSELeap15: python311
> -
>    python3-tomli:
>      # test using tomllib
>      apk:
>      Fedora:
>      Debian12:
> -    OpenSUSELeap15:
> -
> -  python3-venv:
> -    OpenSUSELeap15: python311-base
> -
> -  python3-wheel:
> -    OpenSUSELeap15: python311-wheel
>  
>    rust:
>      Debian12: rustc-web
> @@ -79,12 +26,7 @@ pypi_mappings:
>      default: meson==1.8.1
>  
>    # Drop packages that need devel headers
> -  python3-numpy:
> -    OpenSUSELeap15:
> -
> -  # see above
>    python3-tomli:
>      apk:
>      Fedora:
>      Debian12:
> -    OpenSUSELeap15:

I'm unsure about the mappings stuff just because I'm not sure what it is
for. Does it supplement the mappings in libvirt-ci itself?

Anyway:

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


> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 259e6ea0729..79e0b6776c7 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -226,7 +226,7 @@ try:
>      generate_dockerfile("debian", "debian-13",
>                          trailer="".join(debian13_extras))
>      generate_dockerfile("fedora", "fedora-43")
> -    generate_dockerfile("opensuse-leap", "opensuse-leap-15")
> +    generate_dockerfile("opensuse-leap", "opensuse-leap-16")
>      generate_dockerfile("ubuntu2204", "ubuntu-2204",
>                          trailer="".join(ubuntu2204_rust_extras),
>                          # https://bugs.launchpad.net/ubuntu/+source/rustc-1.83/+bug/2120318

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro