[libvirt] [jenkins-ci PATCH v3 12/12] Switch libvirt-dbus to Meson

[Fabiano Fidêncio]

As libvirt-dbus has switched to using Meson instead of autotools, let's
switch its jobs here.

During the switch, `make check` and `make syntax-check` got merged into
`ninja test`, which is reflected here by merging those two jobs.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
Reviewed-by: Andrea Bolognani <abologna at redhat.com>
---
 .../playbooks/build/projects/libvirt-dbus.yml | 24 ++++++-------------
 jenkins/projects/libvirt-dbus.yaml            | 22 +++++++----------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml
index 148be8f..910fa65 100644
--- a/guests/playbooks/build/projects/libvirt-dbus.yml
+++ b/guests/playbooks/build/projects/libvirt-dbus.yml
@@ -6,36 +6,26 @@
     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'
   vars:
     # flake8 and pyflakes versions currently available on FreeBSD
     # (3.5.0 and 2.0.0 respectively) are not compatible.
+    # Python3 version in Ubuntu 16.04 and python3-pytest version
+    # in CentOS 7 are too old.
     machines:
-      - libvirt-centos-7
       - 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'
+- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
   vars:
-    # Python3 version in Ubuntu 16.04 and python3-pytest version
-    # in CentOS 7 are too old.
+    # RPM build is still not possible on CentOS7 as it does not
+    # have the needed RPM macros for meson.
     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/jenkins/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml
index b4f5e1e..7a1e8f3 100644
--- a/jenkins/projects/libvirt-dbus.yaml
+++ b/jenkins/projects/libvirt-dbus.yaml
@@ -6,31 +6,25 @@
     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'
           # flake8 and pyflakes versions currently available on FreeBSD
           # (3.5.0 and 2.0.0 respectively) are not compatible.
+          # Python3 version in Ubuntu 16.04 and python3-pytest version
+          # in CentOS 7 are too old.
           machines:
-            - libvirt-centos-7
             - libvirt-debian-9
             - libvirt-debian-10
             - libvirt-fedora-29
             - libvirt-fedora-30
             - libvirt-fedora-rawhide
-      - autotools-check-job:
-          parent_jobs: 'libvirt-dbus-syntax-check'
-          # Python 3 version in Ubuntu 16.04 and python3-pytest version
-          # in CentOS 7 are too old.
+      - meson-rpm-job:
+          parent_jobs: 'libvirt-dbus-check'
+          # RPM build is still not possible on CentOS7 as it does not
+          # have the needed RPM macros for meson.
           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