[libvirt] [jenkins-ci PATCH v2 0/2] Add all possible projects to OpenSUSE 15.1
Now that OpenSUSE 15.1 is a thing on libvirt-jenkins-ci, let's add all possible projects to the OS, doing the needed mappings adjustments whenever needed. Changes since v1: https://www.redhat.com/archives/libvir-list/2020-January/msg00321.html - Added libvirt-perl and updated the mappings accordingly. Fabiano Fidêncio (2): guests: Add projects to OpenSUSE 15.1 mappings: Adjust mappings for OpenSUSE 15.1 guests/host_vars/libvirt-opensuse-151/main.yml | 14 ++++++++++++++ guests/playbooks/build/projects/virt-manager.yml | 2 ++ guests/vars/mappings.yml | 15 +++++++++++++++ 3 files changed, 31 insertions(+) -- 2.24.1
libvirt-tck has not been added due to the following missing packages: - perl-Config-Record - perl-IO-Compress-Bzip2 - perl-TAP-Formatter-HTML - perl-TAP-Formatter-JUnit - perl-TAP-Harness-Archive Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> fixup! guests: Add projects to OpenSUSE 15.1 --- guests/host_vars/libvirt-opensuse-151/main.yml | 14 ++++++++++++++ guests/playbooks/build/projects/virt-manager.yml | 2 ++ 2 files changed, 16 insertions(+) diff --git a/guests/host_vars/libvirt-opensuse-151/main.yml b/guests/host_vars/libvirt-opensuse-151/main.yml index f422a9e..88d5dfd 100644 --- a/guests/host_vars/libvirt-opensuse-151/main.yml +++ b/guests/host_vars/libvirt-opensuse-151/main.yml @@ -1,6 +1,20 @@ --- projects: + - gtk-vnc + - libosinfo - libvirt + - libvirt-dbus + - libvirt-glib + - libvirt-go + - libvirt-go-xml + - libvirt-ocaml + - libvirt-perl + - libvirt-python + - libvirt-sandbox + - osinfo-db + - osinfo-db-tools + - virt-manager + - virt-viewer package_format: 'rpm' package_manager: 'zypper' diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index 4b0e6dd..01f353e 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -13,6 +13,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-opensuse-151 - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["virt-manager"][git_remote] }}' @@ -35,6 +36,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-opensuse-151 - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml' vars: -- 2.24.1
On Wed, 2020-01-08 at 15:46 +0100, Fabiano Fidêncio wrote:
guests: Add projects to OpenSUSE 15.1
s/OpenSUSE/openSUSE/ This applies to the other patch too.
libvirt-tck has not been added due to the following missing packages: - perl-Config-Record - perl-IO-Compress-Bzip2 - perl-TAP-Formatter-HTML - perl-TAP-Formatter-JUnit - perl-TAP-Harness-Archive
libvirt-cim is missing as well. I would say you can skip the list and just write libvirt-tck and libvirt-cim could not be added due to missing packages.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
fixup! guests: Add projects to OpenSUSE 15.1
I don't think this was meant to be here O:-) [...]
+++ b/guests/playbooks/build/projects/virt-manager.yml @@ -13,6 +13,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-opensuse-151 - libvirt-ubuntu-1804
You need to add openSUSE 15.1 to the machine list manually for libvirt-dbus and libvirt-sandbox as well. -- Andrea Bolognani / Red Hat / Virtualization
For all the projects which rely on meson, the version present on OpenSUSE 15.1 is too old (0.46.0) to build our projects, which requires 0.49.0. Knowing that, pip is going to be used there. The adjustments done, per project, are: - gtk-vnc: - gdk-pixbuf: gdk-pixbuf-devel - pulseaudio: libpulse-devel - libvirt-dbus: - dbus: dbus-1 - python3-dbus: python3-dbus-python - python3-pip: python3-pip - libvirt-go: - golang: go - libvirt-perl: - perl-Time-HiRes: - Although there's not an equivalent package for perl-Time-HiRes, OpenSUSE seems to have it as part of its base perl packages. - perl-generators: - It's a Fedora/RHEL-ism used for RPM auto-dependencies, not present nor needed on OpenSUSE; - libvirt-python: - python3-devel: python3-devel - libvirt-sandbox: - zlib-static: zlib-devel-static - virt-viewer: - spice-gtk3: spice-gtk-devel - virt-manager: - gtk-update-icon-cache: - isoinfo: mkisofs - python3-libxml2: python3-libxml2-libxml Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/mappings.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index b80a9b4..c942591 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -134,6 +134,7 @@ mappings: dbus-daemon: default: dbus Fedora: dbus-daemon + OpenSUSE: dbus-1 device-mapper: deb: libdevmapper-dev @@ -181,6 +182,7 @@ mappings: rpm: gdk-pixbuf2-devel deb: libgdk-pixbuf2.0-dev pkg: gdk-pixbuf2 + OpenSUSE: gdk-pixbuf-devel cross-policy-deb: foreign gettext: @@ -224,6 +226,7 @@ mappings: go: default: golang FreeBSD: go + OpenSUSE: go gobject-introspection: deb: libgirepository1.0-dev @@ -243,6 +246,7 @@ mappings: gtk-update-icon-cache: default: gtk-update-icon-cache + OpenSUSE: Ubuntu1604: libgtk2.0-bin hal: @@ -267,6 +271,7 @@ mappings: isoinfo: default: genisoimage FreeBSD: cdrkit + OpenSUSE: mkisofs java: deb: openjdk-11-jre-headless @@ -479,6 +484,7 @@ mappings: meson: default: meson + OpenSUSE: CentOS7: Debian9: Ubuntu1604: @@ -799,6 +805,7 @@ mappings: deb: libtime-hr-perl pkg: p5-Time-HiRes rpm: perl-Time-HiRes + OpenSUSE: perl-XML-Twig: deb: libxml-twig-perl @@ -823,6 +830,7 @@ mappings: perl-generators: rpm: perl-generators CentOS7: + OpenSUSE: pkg-config: default: pkgconf @@ -835,6 +843,7 @@ mappings: pulseaudio: deb: libpulse-dev rpm: pulseaudio-libs-devel + OpenSUSE: libpulse-devel cross-policy-deb: foreign python3-docutils: @@ -848,12 +857,14 @@ mappings: python3-dbus: default: python3-dbus FreeBSD: py37-dbus + OpenSUSE: python3-dbus-python CentOS7: python36-dbus python3-devel: deb: python3-dev pkg: python3 Fedora: python3-devel + OpenSUSE: python3-devel CentOS7: python36-devel cross-policy-deb: foreign @@ -866,6 +877,7 @@ mappings: python3-libxml2: default: python3-libxml2 FreeBSD: py37-libxml2 + OpenSUSE: python3-libxml2-python CentOS7: Ubuntu1604: @@ -880,6 +892,7 @@ mappings: CentOS7: python36-nose python3-pip: + OpenSUSE: python3-pip CentOS7: python3-pip Debian9: python3-pip Ubuntu1604: python3-pip @@ -948,6 +961,7 @@ mappings: deb: libspice-client-gtk-3.0-dev pkg: spice-gtk rpm: spice-gtk3-devel + OpenSUSE: spice-gtk-devel cross-policy-deb: foreign strace: @@ -1039,6 +1053,7 @@ mappings: zlib-static: deb: zlib1g-dev rpm: zlib-static + OpenSUSE: zlib-devel-static cross-policy-deb: foreign -- 2.24.1
On Wed, 2020-01-08 at 15:46 +0100, Fabiano Fidêncio wrote:
For all the projects which rely on meson, the version present on OpenSUSE 15.1 is too old (0.46.0) to build our projects, which requires 0.49.0. Knowing that, pip is going to be used there.
I would make this change in a separate commit, since you're not really adding any new package but rather change the source it's coming from. Speaking of which, this commit should go *before* the one where you add the respective projects to libvirt-opensuse-151.
The adjustments done, per project, are: - gtk-vnc: - gdk-pixbuf: gdk-pixbuf-devel - pulseaudio: libpulse-devel
- libvirt-dbus: - dbus: dbus-1 - python3-dbus: python3-dbus-python - python3-pip: python3-pip
- libvirt-go: - golang: go
- libvirt-perl: - perl-Time-HiRes: - Although there's not an equivalent package for perl-Time-HiRes, OpenSUSE seems to have it as part of its base perl packages. - perl-generators: - It's a Fedora/RHEL-ism used for RPM auto-dependencies, not present nor needed on OpenSUSE;
This last point is useful, because it explains why a non-obvious choice was made; the rest of the commit message, not so much IMHO, because all other choices neatly fall in line with what is already present so you're basically just duplicating the contents of the patch. Please leave this part in the commit message and drop the rest.
+++ b/guests/vars/mappings.yml [...] gtk-update-icon-cache: default: gtk-update-icon-cache + OpenSUSE:
This should be OpenSUSE: gtk3-tools because that's the package that contains the gtk-update-icon-cache command. [...]
perl-Time-HiRes: deb: libtime-hr-perl pkg: p5-Time-HiRes rpm: perl-Time-HiRes + OpenSUSE:
This should be OpenSUSE: perl becasue that's the package that includes the module; see the mapping for perl-Archive-Tar for prior art. [...]
perl-generators: rpm: perl-generators CentOS7: + OpenSUSE:
OpenSUSE goes before CentOS7, as the latter is more generic. [...]
python3-pip: + OpenSUSE: python3-pip
This should be OpenSUSE151: python3-pip because hopefully the next version of openSUSE will contain a recent enough version of Meson :) -- Andrea Bolognani / Red Hat / Virtualization
On Wed, 2020-01-08 at 18:43 +0100, Andrea Bolognani wrote:
On Wed, 2020-01-08 at 15:46 +0100, Fabiano Fidêncio wrote: [...]
python3-pip: + OpenSUSE: python3-pip
This should be
OpenSUSE151: python3-pip
because hopefully the next version of openSUSE will contain a recent enough version of Meson :)
Oh and you also need xz-static: OpenSUSE: xz-static-devel for libvirt-sandbox to work. -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Fabiano Fidêncio