[libvirt] [jenkins-ci PATCH v2 06/12] osinfo-db-tools: Build again on all machines

Fabiano Fidêncio fidencio at redhat.com
Tue Oct 8 07:58:41 UTC 2019


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

diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 4e3ce85..908aeef 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -7,6 +7,7 @@ projects:
   - libvirt-ocaml
   - libvirt-perl
   - libvirt-python
+  - 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 c388ee8..054f4e0 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -10,6 +10,7 @@ projects:
   - libvirt-python
   - libvirt-sandbox
   - libvirt-tck
+  - osinfo-db-tools
   - virt-viewer
 
 package_format: 'deb'
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml
index bed11d4..89d4c96 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -10,6 +10,7 @@ projects:
   - libvirt-python
   - libvirt-sandbox
   - libvirt-tck
+  - 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 199b2bb..7ce6711 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -10,6 +10,7 @@ projects:
   - libvirt-python
   - libvirt-sandbox
   - libvirt-tck
+  - osinfo-db-tools
   - virt-viewer
 
 package_format: 'deb'
diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
index 67e5f00..68eb620 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] }}'
 
@@ -20,6 +10,8 @@
 - include: '{{ playbook_base }}/jobs/meson-check-job.yml'
 - include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
   vars:
+    # RPM build is still not possible on CentOS7 as it does not
+    # have the needed RPM macros for meson.
     machines:
       - libvirt-fedora-29
       - libvirt-fedora-30
diff --git a/jenkins/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml
index 8609b46..121da37 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]}'
@@ -20,6 +12,8 @@
           parent_jobs: 'osinfo-db-tools-build'
       - meson-rpm-job:
           parent_jobs: 'osinfo-db-tools-check'
+          # RPM build is still not possible on CentOS7 as it does not
+          # have the needed RPM macros for meson.
           machines:
             - libvirt-fedora-29
             - libvirt-fedora-30
-- 
2.23.0




More information about the libvir-list mailing list