Mind that check & syntax-check jobs have been merged as we dropped
syntax-check target from our Meson builds.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 .../playbooks/build/projects/libvirt-dbus.yml | 23 ++++---------------
 jenkins/projects/libvirt-dbus.yaml            | 18 +++------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml
index a6ff025..7624aea 100644
--- a/guests/playbooks/build/projects/libvirt-dbus.yml
+++ b/guests/playbooks/build/projects/libvirt-dbus.yml
@@ -18,12 +18,13 @@
     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:
     # 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
+    # Python 3 version in Ubuntu 16.04 is too old
     machines:
       - libvirt-debian-9
       - libvirt-debian-10
@@ -31,23 +32,7 @@
       - 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'
+- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
   vars:
     machines: '{{ rpm_machines }}'
diff --git a/jenkins/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml
index 2b72fb4..0ddb0a9 100644
--- a/jenkins/projects/libvirt-dbus.yaml
+++ b/jenkins/projects/libvirt-dbus.yaml
@@ -14,9 +14,9 @@
     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
@@ -27,18 +27,6 @@
             - 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
-          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:
+      - meson-rpm-job:
           parent_jobs: 'libvirt-dbus-check'
           machines: '{rpm_machines}'
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Tue, 2019-10-01 at 16:28 +0200, Fabiano Fidêncio wrote:
> +++ b/guests/playbooks/build/projects/libvirt-dbus.yml
> +- include: '{{ playbook_base }}/jobs/meson-check-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
> +    # Python 3 version in Ubuntu 16.04 is too old

The part of the comment talking about CentOS 7 is clearly no longer
accurate, so we either need to enable this job on the target or leave
it disabled but update the comment to point out the current reason we
need to do so.

> +++ b/jenkins/projects/libvirt-dbus.yaml
> +      - 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

The comments has not been updated here.

I know that mentioning Ubuntu is technically not necessary here
because we don't (yet) have any Ubuntu builder in our CentOS CI
environment, but despite that I prefer keeping everything, even the
comments, in sync between the Ansible and Jenkins parts.

With the comment fixed and propagated to the Jenkins part,

  Reviewed-by: Andrea Bolognani <abologna@redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list