From 5f9efbbcf6fc77e583254389124437d981ad76b9 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 17 Apr 2023 14:46:54 +0200 Subject: tests: lcitool: Switch to OpenSUSE Leap 15.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Daniel P. Berrangé Message-Id: [Adjust for target name change and reword commit message. - Paolo] Signed-off-by: Paolo Bonzini --- tests/docker/dockerfiles/opensuse-leap.docker | 4 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/mappings.yml | 36 +++++++++++++-------------- tests/lcitool/refresh | 2 +- tests/lcitool/targets/opensuse-leap-15.yml | 3 +++ tests/lcitool/targets/opensuse-leap-153.yml | 3 --- 6 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 tests/lcitool/targets/opensuse-leap-15.yml delete mode 100644 tests/lcitool/targets/opensuse-leap-153.yml (limited to 'tests') diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 28f153b..afb9f54 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 2fa24dc..85487e1 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 e4719e4..454963f 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 c0d7ad5..33ef128 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-15.yml b/tests/lcitool/targets/opensuse-leap-15.yml new file mode 100644 index 0000000..683016e --- /dev/null +++ b/tests/lcitool/targets/opensuse-leap-15.yml @@ -0,0 +1,3 @@ +paths: + pip3: /usr/bin/pip3.9 + python: /usr/bin/python3.9 diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/targets/opensuse-leap-153.yml deleted file mode 100644 index 683016e..0000000 --- a/tests/lcitool/targets/opensuse-leap-153.yml +++ /dev/null @@ -1,3 +0,0 @@ -paths: - pip3: /usr/bin/pip3.9 - python: /usr/bin/python3.9 -- cgit v1.1