[libvirt] [jenkins-ci PATCH 16/17] osinfo-db: Build again on all machines

Fabiano Fidêncio posted 17 patches 6 years, 4 months ago
There is a newer version of this series
[libvirt] [jenkins-ci PATCH 16/17] osinfo-db: Build again on all machines
Posted by Fabiano Fidêncio 6 years, 4 months ago
As now we've the needed packages for building and testing osinfo-db
on all systems supported by libvirt-jenkins-ci, let's just build
osinfo-db everywhere.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 guests/playbooks/build/projects/osinfo-db.yml | 14 +-------------
 jenkins/projects/osinfo-db.yaml               | 10 +---------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/guests/playbooks/build/projects/osinfo-db.yml b/guests/playbooks/build/projects/osinfo-db.yml
index 856e478..d910575 100644
--- a/guests/playbooks/build/projects/osinfo-db.yml
+++ b/guests/playbooks/build/projects/osinfo-db.yml
@@ -13,19 +13,7 @@
       $MAKE install OSINFO_DB_TARGET="--system"
 - include: '{{ playbook_base }}/jobs/generic-check-job.yml'
   vars:
-    # osinfo-db tests are Python 3 only, so they can't be ran on CentOS 7;
-    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-16
-      - libvirt-ubuntu-18
+    machines: '{{ all_machines }}'
     command: |
       $MAKE check
 - include: '{{ playbook_base }}/jobs/generic-rpm-job.yml'
diff --git a/jenkins/projects/osinfo-db.yaml b/jenkins/projects/osinfo-db.yaml
index 256c62d..678a464 100644
--- a/jenkins/projects/osinfo-db.yaml
+++ b/jenkins/projects/osinfo-db.yaml
@@ -13,15 +13,7 @@
             $MAKE install OSINFO_DB_TARGET="--system"
       - generic-check-job:
           parent_jobs: 'osinfo-db-build'
-          # osinfo-db tests are Python 3 only, so they can't be ran on CentOS 7;
-          machines:
-            - libvirt-debian-9
-            - libvirt-debian-10
-            - libvirt-fedora-29
-            - libvirt-fedora-30
-            - libvirt-fedora-rawhide
-            - libvirt-freebsd-11
-            - libvirt-freebsd-12
+          machines: '{{ all_machines }}'
           command: |
             $MAKE check
       - generic-rpm-job:
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH 16/17] osinfo-db: Build again on all machines
Posted by Andrea Bolognani 6 years, 4 months ago
On Tue, 2019-10-01 at 16:28 +0200, Fabiano Fidêncio wrote:
> As now we've the needed packages for building and testing osinfo-db
> on all systems supported by libvirt-jenkins-ci, let's just build
> osinfo-db everywhere.
> 
> Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
> ---
>  guests/playbooks/build/projects/osinfo-db.yml | 14 +-------------
>  jenkins/projects/osinfo-db.yaml               | 10 +---------
>  2 files changed, 2 insertions(+), 22 deletions(-)

Here you need to add osinfo-db back to the various

  guests/host_vars/*/main.yml

because they have been, correctly, removed in the meantime.

> +++ b/jenkins/projects/osinfo-db.yaml
> @@ -13,15 +13,7 @@
>              $MAKE install OSINFO_DB_TARGET="--system"
>        - generic-check-job:
>            parent_jobs: 'osinfo-db-build'
> -          # osinfo-db tests are Python 3 only, so they can't be ran on CentOS 7;
> -          machines:
> -            - libvirt-debian-9
> -            - libvirt-debian-10
> -            - libvirt-fedora-29
> -            - libvirt-fedora-30
> -            - libvirt-fedora-rawhide
> -            - libvirt-freebsd-11
> -            - libvirt-freebsd-12
> +          machines: '{{ all_machines }}'

Once again the syntax for the Jenkins part is wrong.

Moreover, you're only changing the list of machines for the check
job, but you should change the one in the top level instead, because
now we can both build and check everywhere; notably, trying to do
the latter without doing the former will certainly not work :)

One last point: in the case of osinfo-db, which doesn't use Meson as
its build system, we should now be able to build RPMs on all
RPM-based operating systems.

With all of the above addressed,

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

Your series is missing one more patch after this one, which does the
same as the last few patches but for virt-manager.

I think the test suite still can't work on CentOS 7 because it uses
python3-libxml2 which is not present there - maybe it should be
ported to python3-lxml? - but we should be able to at least build on
that target, and other targets that got their virt-manager jobs
disabled only on account of not having libosinfo can now have them
fully restored.

-- 
Andrea Bolognani / Red Hat / Virtualization

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