[libvirt-ci PATCH 1/4] guests: Add Ubuntu 20.04
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>
---
.../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