[libvirt] [jenkins-ci PATCH 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. 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 | 13 +++++++++++++ guests/playbooks/build/projects/virt-manager.yml | 2 ++ guests/vars/mappings.yml | 13 +++++++++++++ 3 files changed, 28 insertions(+) -- 2.24.1
The following projects were not added: - libvirt-perl: - missing packages: - perl-TimeHiRes; - perl-generators; - libvirt-tck: - missing packages: - perl-Config-Record - perl-IO-Compress-Bzip2 - perl-TAP-Formatter-HTML - perl-TAP-Formatter-JUnit - perl-TAP-Harness-Archive - perl-accessors - perl-generators 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 | 13 +++++++++++++ guests/playbooks/build/projects/virt-manager.yml | 2 ++ 2 files changed, 15 insertions(+) diff --git a/guests/host_vars/libvirt-opensuse-151/main.yml b/guests/host_vars/libvirt-opensuse-151/main.yml index f422a9e..7efedcd 100644 --- a/guests/host_vars/libvirt-opensuse-151/main.yml +++ b/guests/host_vars/libvirt-opensuse-151/main.yml @@ -1,6 +1,19 @@ --- projects: + - gtk-vnc + - libosinfo - libvirt + - libvirt-dbus + - libvirt-glib + - libvirt-go + - libvirt-go-xml + - libvirt-ocaml + - 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, Jan 08, 2020 at 03:08:44PM +0100, Fabiano Fidêncio wrote:
The following projects were not added: - libvirt-perl: - missing packages: - perl-TimeHiRes; - perl-generators;
perl-generators is a Fedora/RHEL-ism. It isn't a real perl package, just something we use for RPM auto-dependencies. IOW, we don't need it on SUSE at all. For Time::HiRes we should simply patch the code to skip the unit test if its missing. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Wed, Jan 08, 2020 at 02:14:17PM +0000, Daniel P. Berrangé wrote:
On Wed, Jan 08, 2020 at 03:08:44PM +0100, Fabiano Fidêncio wrote:
The following projects were not added: - libvirt-perl: - missing packages: - perl-TimeHiRes; - perl-generators;
perl-generators is a Fedora/RHEL-ism. It isn't a real perl package, just something we use for RPM auto-dependencies.
IOW, we don't need it on SUSE at all.
For Time::HiRes we should simply patch the code to skip the unit test if its missing.
It turns out to *not* be missing. It is a standard module in the main "perl" RPM on SUSE Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
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-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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index b80a9b4..b1e461c 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: @@ -835,6 +841,7 @@ mappings: pulseaudio: deb: libpulse-dev rpm: pulseaudio-libs-devel + OpenSUSE: libpulse-devel cross-policy-deb: foreign python3-docutils: @@ -848,12 +855,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 +875,7 @@ mappings: python3-libxml2: default: python3-libxml2 FreeBSD: py37-libxml2 + OpenSUSE: python3-libxml2-python CentOS7: Ubuntu1604: @@ -880,6 +890,7 @@ mappings: CentOS7: python36-nose python3-pip: + OpenSUSE: python3-pip CentOS7: python3-pip Debian9: python3-pip Ubuntu1604: python3-pip @@ -948,6 +959,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 +1051,7 @@ mappings: zlib-static: deb: zlib1g-dev rpm: zlib-static + OpenSUSE: zlib-devel-static cross-policy-deb: foreign -- 2.24.1
participants (2)
-
Daniel P. Berrangé -
Fabiano Fidêncio