[libvirt] [jenkins-ci PATCH] Switch libvirt-dbus builds to Meson

Fabiano Fidêncio fidencio at redhat.com
Mon Sep 23 11:23:14 UTC 2019


libvirt-dbus has switched its build system to meson and requires 0.49.0
or newer. It means, let's *not* build libvirt-dbus on:
- Debian 9 (or older);
- Ubuntu 18 (or older);
- CentOS 7

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../playbooks/build/projects/libvirt-dbus.yml | 37 +++----------------
 guests/vars/projects/libvirt-dbus.yml         |  1 +
 jenkins/projects/libvirt-dbus.yaml            | 30 +++------------
 3 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml
index a6ff025..a031ba7 100644
--- a/guests/playbooks/build/projects/libvirt-dbus.yml
+++ b/guests/playbooks/build/projects/libvirt-dbus.yml
@@ -1,9 +1,9 @@
 ---
 - set_fact:
     name: libvirt-dbus
+    # libvirt-dbus depends on meson 0.49.0 which is not available on
+    # CentOS 7, Debian 9, Ubuntu 18;
     machines:
-      - libvirt-centos-7
-      - libvirt-debian-9
       - libvirt-debian-10
       - libvirt-debian-sid
       - libvirt-fedora-29
@@ -12,42 +12,15 @@
       - libvirt-freebsd-11
       - libvirt-freebsd-12
       - libvirt-freebsd-current
-      - libvirt-ubuntu-16
-      - libvirt-ubuntu-18
     archive_format: xz
     git_url: '{{ git_urls["libvirt-dbus"][git_remote] }}'
 
 - include: '{{ playbook_base }}/jobs/prepare.yml'
-- include: '{{ playbook_base }}/jobs/autotools-build-job.yml'
-- include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml'
+- include: '{{ playbook_base }}/jobs/meson-build-job.yml'
+- include: '{{ playbook_base }}/jobs/meson-check-job.yml'
+- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
   vars:
-    # CentOS 7 doesn't include Python 3, while the versions of flake8
-    # and pyflakes currently available on FreeBSD (3.5.0 and 2.0.0
-    # respectively) are not compatible
     machines:
-      - libvirt-debian-9
-      - libvirt-debian-10
-      - libvirt-debian-sid
       - libvirt-fedora-29
       - libvirt-fedora-30
       - libvirt-fedora-rawhide
-      - libvirt-ubuntu-16
-      - libvirt-ubuntu-18
-- include: '{{ playbook_base }}/jobs/autotools-check-job.yml'
-  vars:
-    # CentOS 7 doesn't include Python 3 and the version in Ubuntu
-    # 16.04 is too old
-    machines:
-      - libvirt-debian-9
-      - libvirt-debian-10
-      - libvirt-debian-sid
-      - libvirt-fedora-29
-      - libvirt-fedora-30
-      - libvirt-fedora-rawhide
-      - libvirt-freebsd-11
-      - libvirt-freebsd-12
-      - libvirt-freebsd-current
-      - libvirt-ubuntu-18
-- include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml'
-  vars:
-    machines: '{{ rpm_machines }}'
diff --git a/guests/vars/projects/libvirt-dbus.yml b/guests/vars/projects/libvirt-dbus.yml
index ce902cb..406ad86 100644
--- a/guests/vars/projects/libvirt-dbus.yml
+++ b/guests/vars/projects/libvirt-dbus.yml
@@ -3,6 +3,7 @@ packages:
   - dbus-daemon
   - flake8
   - glib2
+  - meson
   - python3
   - python3-dbus
   - python3-gi
diff --git a/jenkins/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml
index 2b72fb4..82eb892 100644
--- a/jenkins/projects/libvirt-dbus.yaml
+++ b/jenkins/projects/libvirt-dbus.yaml
@@ -1,9 +1,9 @@
 ---
 - project:
     name: libvirt-dbus
+    # libvirt-dbus requires meson 0.49.0, which is not available on
+    # CentOS 7 and Debian 9;
     machines:
-      - libvirt-centos-7
-      - libvirt-debian-9
       - libvirt-debian-10
       - libvirt-fedora-29
       - libvirt-fedora-30
@@ -14,31 +14,13 @@
     archive_format: xz
     git_url: '{git_urls[libvirt-dbus][default]}'
     jobs:
-      - autotools-build-job:
+      - meson-build-job:
           parent_jobs: 'libvirt-glib-build'
-      - autotools-syntax-check-job:
+      - meson-check-job:
           parent_jobs: 'libvirt-dbus-build'
-          # CentOS 7 doesn't include Python 3, while the versions of flake8
-          # and pyflakes currently available on FreeBSD (3.5.0 and 2.0.0
-          # respectively) are not compatible
-          machines:
-            - libvirt-debian-9
-            - libvirt-debian-10
-            - libvirt-fedora-29
-            - libvirt-fedora-30
-            - libvirt-fedora-rawhide
-      - autotools-check-job:
-          parent_jobs: 'libvirt-dbus-syntax-check'
-          # CentOS 7 doesn't include Python 3 and the version in Ubuntu
-          # 16.04 is too old
+      - meson-rpm-job:
+          parent_jobs: 'libvirt-dbus-check'
           machines:
-            - libvirt-debian-9
-            - libvirt-debian-10
             - libvirt-fedora-29
             - libvirt-fedora-30
             - libvirt-fedora-rawhide
-            - libvirt-freebsd-11
-            - libvirt-freebsd-12
-      - autotools-rpm-job:
-          parent_jobs: 'libvirt-dbus-check'
-          machines: '{rpm_machines}'
-- 
2.23.0




More information about the libvir-list mailing list