[libvirt] [jenkins-ci PATCH 15/17] libosinfo: Build again on all machines

[Fabiano Fidêncio]

As now we've the needed packages for building and testing libosinfo
on all systems supported by libvirt-jenkins-ci, let's just build
libosinfo everywhere.

RPM build is still not possible in CentOS7 as it doesn't have the
needed RPM macros for Meson.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 guests/host_vars/libvirt-centos-7/main.yml    |  1 +
 guests/host_vars/libvirt-debian-9/main.yml    |  1 +
 guests/host_vars/libvirt-ubuntu-16/main.yml   |  1 +
 guests/host_vars/libvirt-ubuntu-18/main.yml   |  1 +
 guests/playbooks/build/projects/libosinfo.yml | 12 +-----------
 jenkins/projects/libosinfo.yaml               |  8 +-------
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 17f3123..94e29af 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -1,5 +1,6 @@
 ---
 projects:
+  - libosinfo
   - libvirt
   - libvirt-cim
   - libvirt-dbus
diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml
index ebec1b8..6b685a4 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -1,5 +1,6 @@
 ---
 projects:
+  - libosinfo
   - libvirt
   - libvirt-dbus
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml
index 7fc7411..179dd03 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -1,5 +1,6 @@
 ---
 projects:
+  - libosinfo
   - libvirt
   - libvirt-dbus
   - libvirt-glib
diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml
index 9586baa..5b5bf0c 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -1,5 +1,6 @@
 ---
 projects:
+  - libosinfo
   - libvirt
   - libvirt-dbus
   - libvirt-glib
diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml
index f06dbb3..7a8303c 100644
--- a/guests/playbooks/build/projects/libosinfo.yml
+++ b/guests/playbooks/build/projects/libosinfo.yml
@@ -1,17 +1,7 @@
 ---
 - set_fact:
     name: libosinfo
-    # libosinfo depends on meson 0.49.0, which is not available on
-    # CentOS 7, Debian 9, Ubuntu 18;
-    machines:
-      - libvirt-debian-10
-      - libvirt-debian-sid
-      - libvirt-fedora-29
-      - libvirt-fedora-30
-      - libvirt-fedora-rawhide
-      - libvirt-freebsd-11
-      - libvirt-freebsd-12
-      - libvirt-freebsd-current
+    machines: '{{ all_machines }}'
     archive_format: xz
     git_url: '{{ git_urls["libosinfo"][git_remote] }}'
 
diff --git a/jenkins/projects/libosinfo.yaml b/jenkins/projects/libosinfo.yaml
index b38524e..50b2117 100644
--- a/jenkins/projects/libosinfo.yaml
+++ b/jenkins/projects/libosinfo.yaml
@@ -3,13 +3,7 @@
     name: libosinfo
     # libosinfo depends on meson 0.49.0, which is not available on
     # CentOS 7, Debian 9, Ubuntu 18;
-    machines:
-      - libvirt-debian-10
-      - libvirt-fedora-29
-      - libvirt-fedora-30
-      - libvirt-fedora-rawhide
-      - libvirt-freebsd-11
-      - libvirt-freebsd-12
+    machines: '{{ all_machines }}'
     title: libosinfo
     archive_format: xz
     git_url: '{git_urls[libosinfo][default]}'
-- 
2.23.0