[libvirt] [jenkins-ci PATCH v3 08/12] osinfo-db: Build again on all machines

Fabiano Fidêncio fidencio at redhat.com
Tue Oct 8 20:48:20 UTC 2019


As now we've the needed packages for building and testing osinfo-db
on all systems supported by libvirt-jenkins-ci, let's build osinfo-db
everywhere.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
Reviewed-by: Andrea Bolognani <abologna at redhat.com>
---
 guests/host_vars/libvirt-centos-7/main.yml    |  1 +
 guests/host_vars/libvirt-debian-9/main.yml    |  1 +
 guests/host_vars/libvirt-ubuntu-16/main.yml   |  1 +
 guests/host_vars/libvirt-ubuntu-18/main.yml   |  1 +
 guests/playbooks/build/projects/osinfo-db.yml | 15 ++-------------
 jenkins/projects/osinfo-db.yaml               | 13 ++-----------
 6 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 908aeef..17f3123 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -7,6 +7,7 @@ projects:
   - libvirt-ocaml
   - libvirt-perl
   - libvirt-python
+  - osinfo-db
   - osinfo-db-tools
   - virt-viewer
 
diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml
index 054f4e0..c6d774c 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -10,6 +10,7 @@ projects:
   - libvirt-python
   - libvirt-sandbox
   - libvirt-tck
+  - osinfo-db
   - osinfo-db-tools
   - virt-viewer
 
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml
index 89d4c96..7fc7411 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -10,6 +10,7 @@ projects:
   - libvirt-python
   - libvirt-sandbox
   - libvirt-tck
+  - osinfo-db
   - osinfo-db-tools
   - virt-viewer
 
diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml
index 7ce6711..7197037 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -10,6 +10,7 @@ projects:
   - libvirt-python
   - libvirt-sandbox
   - libvirt-tck
+  - osinfo-db
   - osinfo-db-tools
   - virt-viewer
 
diff --git a/guests/playbooks/build/projects/osinfo-db.yml b/guests/playbooks/build/projects/osinfo-db.yml
index 1952827..cc88fe8 100644
--- a/guests/playbooks/build/projects/osinfo-db.yml
+++ b/guests/playbooks/build/projects/osinfo-db.yml
@@ -1,15 +1,7 @@
 ---
 - set_fact:
     name: osinfo-db
-    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
+    machines: '{{ all_machines }}'
     archive_format: xz
     git_url: '{{ git_urls["osinfo-db"][git_remote] }}'
 
@@ -25,10 +17,7 @@
       $MAKE check
 - include: '{{ playbook_base }}/jobs/generic-rpm-job.yml'
   vars:
-    machines:
-      - libvirt-fedora-29
-      - libvirt-fedora-30
-      - libvirt-fedora-rawhide
+    machines: '{{ rpm_machines }}'
     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 7074fd1..87b6748 100644
--- a/jenkins/projects/osinfo-db.yaml
+++ b/jenkins/projects/osinfo-db.yaml
@@ -1,13 +1,7 @@
 ---
 - project:
     name: osinfo-db
-    machines:
-      - libvirt-debian-10
-      - libvirt-fedora-29
-      - libvirt-fedora-30
-      - libvirt-fedora-rawhide
-      - libvirt-freebsd-11
-      - libvirt-freebsd-12
+    machines: '{all_machines}'
     title: osinfo database
     archive_format: xz
     git_url: '{git_urls[osinfo-db][default]}'
@@ -23,10 +17,7 @@
             $MAKE check
       - generic-rpm-job:
           parent_jobs: 'osinfo-db-check'
-          machines:
-            - libvirt-fedora-29
-            - libvirt-fedora-30
-            - libvirt-fedora-rawhide
+          machines: '{rpm_machines}'
           command: |
             {strip_buildrequires}
             rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_sourcedir `pwd`" -ba osinfo-db.spec
-- 
2.23.0




More information about the libvir-list mailing list