[libvirt] [jenkins-ci PATCH 2/2] guests: Drop Ubuntu 18.04
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/host_vars/libvirt-ubuntu-16/docker.yml | 2 --
.../host_vars/libvirt-ubuntu-16/install.yml | 2 --
guests/host_vars/libvirt-ubuntu-16/main.yml | 22 -------------------
guests/inventory | 1 -
guests/vars/mappings.yml | 3 ---
5 files changed, 30 deletions(-)
delete mode 100644 guests/host_vars/libvirt-ubuntu-16/docker.yml
delete mode 100644 guests/host_vars/libvirt-ubuntu-16/install.yml
delete mode 100644 guests/host_vars/libvirt-ubuntu-16/main.yml
diff --git a/guests/host_vars/libvirt-ubuntu-16/docker.yml
b/guests/host_vars/libvirt-ubuntu-16/docker.yml
deleted file mode 100644
index 2d4eb25..0000000
--- a/guests/host_vars/libvirt-ubuntu-16/docker.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-docker_base: ubuntu:16.04
diff --git a/guests/host_vars/libvirt-ubuntu-16/install.yml
b/guests/host_vars/libvirt-ubuntu-16/install.yml
deleted file mode 100644
index d8ce841..0000000
--- a/guests/host_vars/libvirt-ubuntu-16/install.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-install_url: http://archive.ubuntu.com/ubuntu/dists/xenial/main/installer-amd64/
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml
b/guests/host_vars/libvirt-ubuntu-16/main.yml
deleted file mode 100644
index 0e38128..0000000
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-projects:
- - 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-viewer
-
-package_format: 'deb'
-os_name: 'Ubuntu'
-os_version: '16'
-
-ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/inventory b/guests/inventory
index 4cf8e1b..d79ba63 100644
--- a/guests/inventory
+++ b/guests/inventory
@@ -7,5 +7,4 @@ libvirt-fedora-rawhide
libvirt-freebsd-11
libvirt-freebsd-12
libvirt-freebsd-current
-libvirt-ubuntu-16
libvirt-ubuntu-18
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index edd658e..92681c2 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -190,7 +190,6 @@ mappings:
deb: libglusterfs-dev
rpm: glusterfs-api-devel
Debian9: glusterfs-common
- Ubuntu16: glusterfs-common
Ubuntu18: glusterfs-common
cross-policy-deb: foreign
@@ -225,7 +224,6 @@ mappings:
gtk-update-icon-cache:
default: gtk-update-icon-cache
- Ubuntu16: libgtk2.0-bin
gtk-vnc2:
deb: libgtk-vnc-2.0-dev
@@ -799,7 +797,6 @@ mappings:
default: python3-libxml2
FreeBSD: py36-libxml2
CentOS7:
- Ubuntu16:
python3-lxml:
default: python3-lxml
--
2.20.1