aboutsummaryrefslogtreecommitdiff
path: root/tests/lcitool
diff options
context:
space:
mode:
authorPeter Krempa <pkrempa@redhat.com>2023-04-17 14:46:54 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-04-20 11:17:36 +0200
commit5f9efbbcf6fc77e583254389124437d981ad76b9 (patch)
treef0365b7b3b32765a5bcc5c29e80fe99476d1ce2c /tests/lcitool
parentdacc122e5eedf63ae90b50fec7e63cd8b04cafb3 (diff)
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>
Diffstat (limited to 'tests/lcitool')
m---------tests/lcitool/libvirt-ci0
-rw-r--r--tests/lcitool/mappings.yml36
-rwxr-xr-xtests/lcitool/refresh2
-rw-r--r--tests/lcitool/targets/opensuse-leap-15.yml (renamed from tests/lcitool/targets/opensuse-leap-153.yml)0
4 files changed, 19 insertions, 19 deletions
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
-Subproject 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae9
+Subproject 85487e140415b2ac54b01a9a6b600fd7c21edc2
diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml
index e4719e4551..454963f07b 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 c0d7ad5516..33ef1282da 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
index 683016e007..683016e007 100644
--- a/tests/lcitool/targets/opensuse-leap-153.yml
+++ b/tests/lcitool/targets/opensuse-leap-15.yml