[libvirt] [jenkins-ci PATCH 2/4] Only build libosinfo on systems with meson >= 0.49.0

Fabiano Fidêncio fidencio at redhat.com
Tue Sep 24 07:02:48 UTC 2019


libosinfo has switched its build system to meson and requires 0.49.0 or
newer.

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 | 17 +++++++++++++++--
 jenkins/projects/libosinfo.yaml               | 16 ++++++++++++++--
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 72db363..6156414 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -1,6 +1,5 @@
 ---
 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 c45c0fb..cb19395 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -1,6 +1,5 @@
 ---
 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 3e9ae9f..0407ae3 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -1,6 +1,5 @@
 ---
 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 4a38ab0..4a95f45 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -1,6 +1,5 @@
 ---
 projects:
-  - libosinfo
   - libvirt
   - libvirt-dbus
   - libvirt-glib
diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml
index 311a52b..60a6df2 100644
--- a/guests/playbooks/build/projects/libosinfo.yml
+++ b/guests/playbooks/build/projects/libosinfo.yml
@@ -1,7 +1,17 @@
 ---
 - set_fact:
     name: libosinfo
-    machines: '{{ all_machines }}'
+    # 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
     archive_format: gz
     git_url: '{{ git_urls["libosinfo"][git_remote] }}'
 
@@ -11,4 +21,7 @@
 - include: '{{ playbook_base }}/jobs/autotools-check-job.yml'
 - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml'
   vars:
-    machines: '{{ rpm_machines }}'
+    machines:
+      - libvirt-fedora-29
+      - libvirt-fedora-30
+      - libvirt-fedora-rawhide
diff --git a/jenkins/projects/libosinfo.yaml b/jenkins/projects/libosinfo.yaml
index d20d3f2..409c1f9 100644
--- a/jenkins/projects/libosinfo.yaml
+++ b/jenkins/projects/libosinfo.yaml
@@ -1,7 +1,16 @@
 ---
 - project:
     name: libosinfo
-    machines: '{all_machines}'
+    # 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
     title: libosinfo
     archive_format: gz
     git_url: '{git_urls[libosinfo][default]}'
@@ -14,4 +23,7 @@
           parent_jobs: 'libosinfo-syntax-check'
       - autotools-rpm-job:
           parent_jobs: 'libosinfo-check'
-          machines: '{rpm_machines}'
+          machines:
+            - libvirt-fedora-29
+            - libvirt-fedora-30
+            - libvirt-fedora-rawhide
-- 
2.23.0




More information about the libvir-list mailing list