[libvirt] [jenkins-ci PATCH v2 08/12] libosinfo: Build again on all machines

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


As now we've the needed packages for building and testing libosinfo
on all systems supported by libvirt-jenkins-ci, let's 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 | 14 +++-----------
 jenkins/projects/libosinfo.yaml               | 10 +++-------
 6 files changed, 10 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 c6d774c..6ac3808 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 7197037..e9a5a7b 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..bb583c7 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] }}'
 
@@ -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/libosinfo.yaml b/jenkins/projects/libosinfo.yaml
index b38524e..90fc465 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]}'
@@ -20,6 +14,8 @@
           parent_jobs: 'libosinfo-build'
       - meson-rpm-job:
           parent_jobs: 'libosinfo-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