Note that 'lcitool install' is not currently supported for this platform, because Ubuntu switched to a new installer which virt-install doesn't know about and we have no unattended installation support for; the old installer is still available, but it now lives in a different path and that means virt-install doesn't know how to fetch it. Once virt-install has been updated to support either form of unattended installation for Ubuntu 20.04 we can update lcitool accordingly, but for now this will do: we don't have any Ubuntu VMs on CentOS CI anyway, and building Ubuntu 20.04 containers for use on GitLab CI already works perfectly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .../host_vars/libvirt-ubuntu-2004/docker.yml | 2 + guests/host_vars/libvirt-ubuntu-2004/main.yml | 40 +++++++++++++++++++ guests/inventory | 1 + guests/vars/mappings.yml | 3 +- 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 guests/host_vars/libvirt-ubuntu-2004/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-2004/main.yml diff --git a/guests/host_vars/libvirt-ubuntu-2004/docker.yml b/guests/host_vars/libvirt-ubuntu-2004/docker.yml new file mode 100644 index 0000000..d0f4b14 --- /dev/null +++ b/guests/host_vars/libvirt-ubuntu-2004/docker.yml @@ -0,0 +1,2 @@ +--- +docker_base: ubuntu:20.04 diff --git a/guests/host_vars/libvirt-ubuntu-2004/main.yml b/guests/host_vars/libvirt-ubuntu-2004/main.yml new file mode 100644 index 0000000..4edfa90 --- /dev/null +++ b/guests/host_vars/libvirt-ubuntu-2004/main.yml @@ -0,0 +1,40 @@ +--- +projects: + - gtk-vnc + - libosinfo + - libvirt + - libvirt-dbus + - libvirt-glib + - libvirt-go + - libvirt-go-xml + - libvirt-ocaml + - libvirt-perl + - libvirt-python + - libvirt-sandbox + - libvirt-tck + - osinfo-db + - osinfo-db-tools + - virt-manager + - virt-viewer + +os: + name: 'Ubuntu' + version: '2004' + +packaging: + format: 'deb' + command: 'apt-get' + +paths: + bash: /bin/bash + cc: /usr/bin/gcc + ccache: /usr/bin/ccache + java: /usr/bin/java + make: /usr/bin/make + ninja: /usr/bin/ninja + python: /usr/bin/python3 + su: /bin/su + sudoers: /etc/sudoers + +ansible_python_package: python3 +ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/inventory b/guests/inventory index 0a876c8..5fced6a 100644 --- a/guests/inventory +++ b/guests/inventory @@ -12,3 +12,4 @@ libvirt-freebsd-current libvirt-opensuse-151 libvirt-ubuntu-1604 libvirt-ubuntu-1804 +libvirt-ubuntu-2004 diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4a19fb4..1c06408 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -951,8 +951,9 @@ mappings: sheepdog: default: Fedora: sheepdog - Ubuntu: sheepdog Debian9: sheepdog + Ubuntu1604: sheepdog + Ubuntu1804: sheepdog showmount: deb: nfs-common -- 2.25.4

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- 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

On Thu, Apr 30, 2020 at 04:37:33PM +0200, Andrea Bolognani wrote: The release of 20.04 invalidates 16.04 too - we only need to keep N and N-1, never N-2. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|