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(a)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