diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2024-01-08 12:01:10 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2024-01-08 17:04:01 +0000 |
| commit | 9b320d673300f22809838fc81c4531e54a9f4b37 (patch) | |
| tree | fe5357af796e1df2c56385cc28b339771884676b | |
| parent | 8c91f17d31b0369241bd573f5dd499a6fa49eea6 (diff) | |
| download | libvirt-ci-9b320d673300f22809838fc81c4531e54a9f4b37.zip libvirt-ci-9b320d673300f22809838fc81c4531e54a9f4b37.tar.gz libvirt-ci-9b320d673300f22809838fc81c4531e54a9f4b37.tar.bz2 | |
Enable python3-build on recent OpenSUSE, AlmaLinux & CentOS versions
Change the python3-build mapping so that it is more futureproof,
by assuming it will be available in all future RPM distro
releases, and that forthcoming Ubuntu 24.04 will be fixed.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | lcitool/facts/mappings.yml | 10 | ||||
| -rw-r--r-- | tests/data/packages/out/almalinux-9.yml | 2 | ||||
| -rw-r--r-- | tests/data/packages/out/centos-stream-9.yml | 2 | ||||
| -rw-r--r-- | tests/data/packages/out/opensuse-tumbleweed.yml | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 548e93c..8df4957 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -1688,9 +1688,15 @@ mappings: apk: py3-build deb: python3-build pkg: py39-build - Fedora: python3-build + rpm: python3-build MacOS: python-build - Ubuntu: + AlmaLinux8: + CentOSStream8: + OpenSUSELeap15: + Ubuntu2004: + # Present but broken for our needs + # https://bugs.launchpad.net/ubuntu/+source/python-build/+bug/1992108 + Ubuntu2204: python3-dbus: default: python3-dbus diff --git a/tests/data/packages/out/almalinux-9.yml b/tests/data/packages/out/almalinux-9.yml index d3dddbf..c7675f2 100644 --- a/tests/data/packages/out/almalinux-9.yml +++ b/tests/data/packages/out/almalinux-9.yml @@ -203,6 +203,7 @@ native: - python3 - python3-PyYAML - python3-boto3 +- python3-build - python3-dbus - python3-devel - python3-docutils @@ -268,5 +269,4 @@ native: - zstd pypi: - black -- build - pillow diff --git a/tests/data/packages/out/centos-stream-9.yml b/tests/data/packages/out/centos-stream-9.yml index d3dddbf..c7675f2 100644 --- a/tests/data/packages/out/centos-stream-9.yml +++ b/tests/data/packages/out/centos-stream-9.yml @@ -203,6 +203,7 @@ native: - python3 - python3-PyYAML - python3-boto3 +- python3-build - python3-dbus - python3-devel - python3-docutils @@ -268,5 +269,4 @@ native: - zstd pypi: - black -- build - pillow diff --git a/tests/data/packages/out/opensuse-tumbleweed.yml b/tests/data/packages/out/opensuse-tumbleweed.yml index 6940990..0995cdb 100644 --- a/tests/data/packages/out/opensuse-tumbleweed.yml +++ b/tests/data/packages/out/opensuse-tumbleweed.yml @@ -220,6 +220,7 @@ native: - python3-base - python3-black - python3-boto3 +- python3-build - python3-dbus-python - python3-devel - python3-docutils @@ -288,5 +289,3 @@ native: - zlib-devel - zlib-devel-static - zstd -pypi: -- build |