As now we've the needed packages for building and testing
osinfo-db-tools on all systems supported by libvirt-jenkins-ci, let's
just build osinfo-db-tools 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@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/osinfo-db-tools.yml | 12 +-----------
 jenkins/projects/osinfo-db-tools.yaml               | 10 +---------
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 6156414..17f3123 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -8,6 +8,7 @@ projects:
   - libvirt-perl
   - libvirt-python
   - osinfo-db
+  - osinfo-db-tools
   - virt-viewer
 
 package_format: 'rpm'
diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml
index cb19395..ebec1b8 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -11,6 +11,7 @@ projects:
   - libvirt-sandbox
   - libvirt-tck
   - osinfo-db
+  - osinfo-db-tools
   - virt-manager
   - virt-viewer
 
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml
index 0407ae3..7fc7411 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -11,6 +11,7 @@ projects:
   - libvirt-sandbox
   - libvirt-tck
   - osinfo-db
+  - osinfo-db-tools
   - virt-viewer
 
 package_format: 'deb'
diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml
index 4a95f45..9586baa 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -11,6 +11,7 @@ projects:
   - libvirt-sandbox
   - libvirt-tck
   - osinfo-db
+  - osinfo-db-tools
   - virt-manager
   - virt-viewer
 
diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
index 67e5f00..54b77fd 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
@@ -1,17 +1,7 @@
 ---
 - set_fact:
     name: osinfo-db-tools
-    # osinfo-db-tools 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["osinfo-db-tools"][git_remote] }}'
 
diff --git a/jenkins/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml
index 8609b46..635b572 100644
--- a/jenkins/projects/osinfo-db-tools.yaml
+++ b/jenkins/projects/osinfo-db-tools.yaml
@@ -1,15 +1,7 @@
 ---
 - project:
     name: osinfo-db-tools
-    # osinfo-db-tools requires meson 0.49.0, which is not available on
-    # CentOS 7 and Debian 9;
-    machines:
-      - libvirt-debian-10
-      - libvirt-fedora-29
-      - libvirt-fedora-30
-      - libvirt-fedora-rawhide
-      - libvirt-freebsd-11
-      - libvirt-freebsd-12
+    machines: '{{ all_machines }}'
     title: osinfo database tools
     archive_format: xz
     git_url: '{git_urls[osinfo-db-tools][default]}'
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Tue, 2019-10-01 at 16:28 +0200, Fabiano Fidêncio wrote:
> As now we've the needed packages for building and testing
> osinfo-db-tools on all systems supported by libvirt-jenkins-ci, let's
> just build osinfo-db-tools everywhere.
> 
> RPM build is still not possible in CentOS7 as it doesn't have the
> needed RPM macros for Meson.

I think it would be a good idea to document this fact right in the
corresponding file with a comment, same as we've done with other
cases where we had to exclude a specific target platform from a
build job for one reason or another.

> +++ b/guests/host_vars/libvirt-centos-7/main.yml
> @@ -8,6 +8,7 @@ projects:
>    - libvirt-perl
>    - libvirt-python
>    - osinfo-db
> +  - osinfo-db-tools
>    - virt-viewer

This (and the similar changes made to other files) will conflict with
recent fixes I've pushed, but addressing that is trivial.

> +++ b/jenkins/projects/osinfo-db-tools.yaml
> @@ -1,15 +1,7 @@
>  ---
>  - project:
>      name: osinfo-db-tools
> -    # osinfo-db-tools requires meson 0.49.0, which is not available on
> -    # CentOS 7 and Debian 9;
> -    machines:
> -      - libvirt-debian-10
> -      - libvirt-fedora-29
> -      - libvirt-fedora-30
> -      - libvirt-fedora-rawhide
> -      - libvirt-freebsd-11
> -      - libvirt-freebsd-12
> +    machines: '{{ all_machines }}'

For the Jenkins part you need to use

  machines: '{all_machines}'

or it won't work.

With that fixed and a comment about RPM macros added,

  Reviewed-by: Andrea Bolognani <abologna@redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list