As osinfo-db-tools, osindo-db, and libosinfo can now be built again on
Debian9 and Ubuntu18, let's enable virt-manager builds on those OSes as
well.
This commit partilly reverts 570143fc41fa270.
Signed-off-by: Fabiano FidĂȘncio <fidencio(a)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/virt-manager.yml | 4 ++++
jenkins/projects/virt-manager.yaml | 2 ++
6 files changed, 10 insertions(+)
diff --git a/guests/host_vars/libvirt-centos-7/main.yml
b/guests/host_vars/libvirt-centos-7/main.yml
index 94e29af..49b0ed7 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -10,6 +10,7 @@ projects:
- libvirt-python
- osinfo-db
- osinfo-db-tools
+ - virt-manager
- virt-viewer
package_format: 'rpm'
diff --git a/guests/host_vars/libvirt-debian-9/main.yml
b/guests/host_vars/libvirt-debian-9/main.yml
index 6ac3808..6b685a4 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -13,6 +13,7 @@ projects:
- libvirt-tck
- osinfo-db
- osinfo-db-tools
+ - virt-manager
- virt-viewer
package_format: 'deb'
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml
b/guests/host_vars/libvirt-ubuntu-16/main.yml
index 179dd03..6ac9505 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -13,6 +13,7 @@ projects:
- libvirt-tck
- osinfo-db
- osinfo-db-tools
+ - virt-manager
- virt-viewer
package_format: 'deb'
diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml
b/guests/host_vars/libvirt-ubuntu-18/main.yml
index e9a5a7b..5b5bf0c 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -13,6 +13,7 @@ projects:
- libvirt-tck
- osinfo-db
- osinfo-db-tools
+ - virt-manager
- virt-viewer
package_format: 'deb'
diff --git a/guests/playbooks/build/projects/virt-manager.yml
b/guests/playbooks/build/projects/virt-manager.yml
index 0078fbe..f955f4c 100644
--- a/guests/playbooks/build/projects/virt-manager.yml
+++ b/guests/playbooks/build/projects/virt-manager.yml
@@ -5,6 +5,7 @@
# Ubuntu 16.04 has Python 3 but not the libxml2 bindings, so it can't
# build the project either
machines:
+ - libvirt-debian-9
- libvirt-debian-10
- libvirt-debian-sid
- libvirt-fedora-29
@@ -13,6 +14,7 @@
- libvirt-freebsd-11
- libvirt-freebsd-12
- libvirt-freebsd-current
+ - libvirt-ubuntu-18
archive_format: gz
git_url: '{{ git_urls["virt-manager"][git_remote] }}'
@@ -27,11 +29,13 @@
# so skip the test suite there for the time being. See
#
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902
machines:
+ - libvirt-debian-9
- libvirt-debian-10
- libvirt-debian-sid
- libvirt-fedora-29
- libvirt-fedora-30
- libvirt-fedora-rawhide
+ - libvirt-ubuntu-18
- include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml'
vars:
machines:
diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml
index fe6b903..2577ea9 100644
--- a/jenkins/projects/virt-manager.yaml
+++ b/jenkins/projects/virt-manager.yaml
@@ -5,6 +5,7 @@
# Ubuntu 16.04 has Python 3 but not the libxml2 bindings, so it can't
# build the project either
machines:
+ - libvirt-debian-9
- libvirt-debian-10
- libvirt-fedora-29
- libvirt-fedora-30
@@ -27,6 +28,7 @@
# so skip the test suite there for the time being. See
#
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902
machines:
+ - libvirt-debian-9
- libvirt-debian-10
- libvirt-fedora-29
- libvirt-fedora-30
--
2.23.0