Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
guests/playbooks/build/jobs/defaults.yml | 1 -
guests/playbooks/build/projects/libvirt-dbus.yml | 3 +--
guests/playbooks/build/projects/libvirt-sandbox.yml | 1 -
guests/playbooks/build/projects/libvirt-tck.yml | 1 -
guests/playbooks/build/projects/libvirt.yml | 1 -
guests/playbooks/build/projects/virt-manager.yml | 2 +-
jenkins/projects/libvirt-dbus.yaml | 3 +--
jenkins/projects/virt-manager.yaml | 2 +-
8 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml
index 3413ed4..d7906db 100644
--- a/guests/playbooks/build/jobs/defaults.yml
+++ b/guests/playbooks/build/jobs/defaults.yml
@@ -12,7 +12,6 @@ all_machines:
- libvirt-freebsd-12
- libvirt-freebsd-current
- libvirt-opensuse-151
- - libvirt-ubuntu-1604
- libvirt-ubuntu-1804
- libvirt-ubuntu-2004
rpm_machines:
diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml
index 6ab62b9..1fd1d4b 100644
--- a/guests/playbooks/build/projects/libvirt-dbus.yml
+++ b/guests/playbooks/build/projects/libvirt-dbus.yml
@@ -11,8 +11,7 @@
vars:
# flake8 and pyflakes versions currently available on FreeBSD
# (3.5.0 and 2.0.0 respectively) are not compatible.
- # Python3 version in Ubuntu 16.04 and python3-pytest version
- # in CentOS 7 are too old.
+ # The python3-pytest version in CentOS 7 is too old.
machines:
- libvirt-centos-8
- libvirt-debian-9
diff --git a/guests/playbooks/build/projects/libvirt-sandbox.yml b/guests/playbooks/build/projects/libvirt-sandbox.yml
index bf81365..520c8cf 100644
--- a/guests/playbooks/build/projects/libvirt-sandbox.yml
+++ b/guests/playbooks/build/projects/libvirt-sandbox.yml
@@ -12,7 +12,6 @@
- libvirt-fedora-32
- libvirt-fedora-rawhide
- libvirt-opensuse-151
- - libvirt-ubuntu-1604
- libvirt-ubuntu-1804
- libvirt-ubuntu-2004
archive_format: gz
diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playbooks/build/projects/libvirt-tck.yml
index 79d7e5d..f564666 100644
--- a/guests/playbooks/build/projects/libvirt-tck.yml
+++ b/guests/playbooks/build/projects/libvirt-tck.yml
@@ -13,7 +13,6 @@
- libvirt-freebsd-11
- libvirt-freebsd-12
- libvirt-freebsd-current
- - libvirt-ubuntu-1604
- libvirt-ubuntu-1804
- libvirt-ubuntu-2004
archive_format: gz
diff --git a/guests/playbooks/build/projects/libvirt.yml b/guests/playbooks/build/projects/libvirt.yml
index 40b9e4f..f848a1a 100644
--- a/guests/playbooks/build/projects/libvirt.yml
+++ b/guests/playbooks/build/projects/libvirt.yml
@@ -21,7 +21,6 @@
- libvirt-fedora-32
- libvirt-fedora-rawhide
- libvirt-opensuse-151
- - libvirt-ubuntu-1604
- libvirt-ubuntu-1804
- libvirt-ubuntu-2004
- include: '{{ playbook_base }}/jobs/autotools-check-job.yml'
diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml
index 108e445..66db882 100644
--- a/guests/playbooks/build/projects/virt-manager.yml
+++ b/guests/playbooks/build/projects/virt-manager.yml
@@ -1,7 +1,7 @@
---
- set_fact:
name: virt-manager
- # CentOS 7 and Ubuntu 16.04 have Python 3 but not the libxml2 bindings
+ # CentOS 7 has Python 3 but not the libxml2 bindings
machines:
- libvirt-centos-8
- libvirt-debian-9
diff --git a/jenkins/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml
index 9ac5fee..8aea8f8 100644
--- a/jenkins/projects/libvirt-dbus.yaml
+++ b/jenkins/projects/libvirt-dbus.yaml
@@ -12,8 +12,7 @@
parent_jobs: 'libvirt-dbus-build'
# flake8 and pyflakes versions currently available on FreeBSD
# (3.5.0 and 2.0.0 respectively) are not compatible.
- # Python3 version in Ubuntu 16.04 and python3-pytest version
- # in CentOS 7 are too old.
+ # The python3-pytest version in CentOS 7 is too old.
machines:
- libvirt-debian-9
- libvirt-debian-10
diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml
index 663f1e4..7dae9c3 100644
--- a/jenkins/projects/virt-manager.yaml
+++ b/jenkins/projects/virt-manager.yaml
@@ -1,7 +1,7 @@
---
- project:
name: virt-manager
- # CentOS 7 and Ubuntu 16.04 have Python 3 but not the libxml2 bindings
+ # CentOS 7 has Python 3 but not the libxml2 bindings
machines:
- libvirt-debian-9
- libvirt-debian-10
--
2.25.4
