mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
tests: lcitool: Switch to OpenSUSE Leap 15.4
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 <pkrempa@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <a408b7f241ac59e5944db6ae2360a792305c36e0.1681735482.git.pkrempa@redhat.com> [Adjust for target name change and reword commit message. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
dacc122e5e
commit
5f9efbbcf6
|
@ -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 \
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95
|
||||
Subproject commit 85487e140415b2ac54b01a9a6b600fd7c21edc2f
|
|
@ -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:
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
Loading…
Reference in a new issue