[libvirt] [jenkins-ci PATCH] Fix target list for osinfo-db builds

Andrea Bolognani abologna at redhat.com
Wed Oct 2 17:38:14 UTC 2019


Commit 570143fc41fa removed all unsuitable Debian-based
distributions, but failed to account for the fact that CentOS 7
doesn't have a Meson version suitable to build osinfo-db-tools
and as such can't possibly build osinfo-db.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
Pushed as a CI fix.

 guests/playbooks/build/projects/osinfo-db.yml | 25 ++++++++++---------
 jenkins/projects/osinfo-db.yaml               | 21 ++++++++--------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/guests/playbooks/build/projects/osinfo-db.yml b/guests/playbooks/build/projects/osinfo-db.yml
index 872b448..1952827 100644
--- a/guests/playbooks/build/projects/osinfo-db.yml
+++ b/guests/playbooks/build/projects/osinfo-db.yml
@@ -1,7 +1,15 @@
 ---
 - set_fact:
     name: osinfo-db
-    machines: '{{ all_machines }}'
+    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: xz
     git_url: '{{ git_urls["osinfo-db"][git_remote] }}'
 
@@ -13,21 +21,14 @@
       $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-10
-      - libvirt-debian-sid
-      - libvirt-fedora-29
-      - libvirt-fedora-30
-      - libvirt-fedora-rawhide
-      - libvirt-freebsd-11
-      - libvirt-freebsd-12
-      - libvirt-freebsd-current
     command: |
       $MAKE check
 - include: '{{ playbook_base }}/jobs/generic-rpm-job.yml'
   vars:
-    machines: '{{ rpm_machines }}'
+    machines:
+      - libvirt-fedora-29
+      - libvirt-fedora-30
+      - libvirt-fedora-rawhide
     command: |
       {{ strip_buildrequires }}
       rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_sourcedir `pwd`" -ba osinfo-db.spec
diff --git a/jenkins/projects/osinfo-db.yaml b/jenkins/projects/osinfo-db.yaml
index 37c1d84..7074fd1 100644
--- a/jenkins/projects/osinfo-db.yaml
+++ b/jenkins/projects/osinfo-db.yaml
@@ -1,7 +1,13 @@
 ---
 - project:
     name: osinfo-db
-    machines: '{all_machines}'
+    machines:
+      - libvirt-debian-10
+      - libvirt-fedora-29
+      - libvirt-fedora-30
+      - libvirt-fedora-rawhide
+      - libvirt-freebsd-11
+      - libvirt-freebsd-12
     title: osinfo database
     archive_format: xz
     git_url: '{git_urls[osinfo-db][default]}'
@@ -13,19 +19,14 @@
             $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-10
-            - libvirt-fedora-29
-            - libvirt-fedora-30
-            - libvirt-fedora-rawhide
-            - libvirt-freebsd-11
-            - libvirt-freebsd-12
           command: |
             $MAKE check
       - generic-rpm-job:
           parent_jobs: 'osinfo-db-check'
-          machines: '{rpm_machines}'
+          machines:
+            - libvirt-fedora-29
+            - libvirt-fedora-30
+            - libvirt-fedora-rawhide
           command: |
             {strip_buildrequires}
             rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_sourcedir `pwd`" -ba osinfo-db.spec
-- 
2.21.0




More information about the libvir-list mailing list