From: Peter Krempa <pkre...@redhat.com> Since OpenSUSE Leap 15 counts as a single major release of an LTS distribution, lcitool has changed the target name to remove the minor version. Adjust the mappings and refresh script.
This also updates the dockerfile to 15.4, since the 15.3 version is EOL now: https://get.opensuse.org/leap/15.3 Signed-off-by: Peter Krempa <pkre...@redhat.com> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> Message-Id: <a408b7f241ac59e5944db6ae2360a792305c36e0.1681735482.git.pkre...@redhat.com> [Adjust for target name change and reword commit message. - Paolo] Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- tests/docker/dockerfiles/opensuse-leap.docker | 4 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/mappings.yml | 36 +++++++++---------- tests/lcitool/refresh | 2 +- ...suse-leap-153.yml => opensuse-leap-15.yml} | 0 5 files changed, 22 insertions(+), 22 deletions(-) rename tests/lcitool/targets/{opensuse-leap-153.yml => opensuse-leap-15.yml} (100%) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 28f153b77b56..afb9f5419f5c 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-15 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 \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 2fa24dce8bc2..85487e140415 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95 +Subproject commit 85487e140415b2ac54b01a9a6b600fd7c21edc2f diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index e4719e45516c..454963f07b86 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -1,71 +1,71 @@ mappings: flake8: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: meson: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base python3-PyYAML: CentOSStream8: python38-PyYAML - OpenSUSELeap153: + OpenSUSELeap15: python3-devel: CentOSStream8: python38-devel - OpenSUSELeap153: python39-devel + OpenSUSELeap15: python39-devel python3-docutils: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3-numpy: CentOSStream8: python38-numpy - OpenSUSELeap153: + OpenSUSELeap15: python3-opencv: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3-pip: CentOSStream8: python38-pip - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3-selinux: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3-setuptools: CentOSStream8: python38-setuptools - OpenSUSELeap153: python39-setuptools + OpenSUSELeap15: python39-setuptools python3-sphinx: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3-sphinx-rtd-theme: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: python3-venv: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base python3-wheel: CentOSStream8: python38-wheel - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip pypi_mappings: # Request more recent version @@ -74,4 +74,4 @@ pypi_mappings: # Drop packages that need devel headers python3-numpy: - OpenSUSELeap153: + OpenSUSELeap15: diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index c0d7ad551649..33ef1282dac4 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-15") generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2204", "ubuntu-2204") diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/targets/opensuse-leap-15.yml similarity index 100% rename from tests/lcitool/targets/opensuse-leap-153.yml rename to tests/lcitool/targets/opensuse-leap-15.yml -- 2.40.0
