On Thu, Apr 30, 2020 at 04:37:33PM +0200, Andrea Bolognani wrote: > It's now two years after a newer LTS version, Ubuntu 18.04, was > released, so according to our platform support policy we no longer > need to support Ubuntu 16.04. The release of 20.04 invalidates 16.04 too - we only need to keep N and N-1, never N-2. > > Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> > --- > .../host_vars/libvirt-ubuntu-1604/docker.yml | 2 - > .../host_vars/libvirt-ubuntu-1604/install.yml | 2 - > guests/host_vars/libvirt-ubuntu-1604/main.yml | 39 ------------------- > guests/inventory | 1 - > guests/vars/mappings.yml | 7 ---- > 5 files changed, 51 deletions(-) > delete mode 100644 guests/host_vars/libvirt-ubuntu-1604/docker.yml > delete mode 100644 guests/host_vars/libvirt-ubuntu-1604/install.yml > delete mode 100644 guests/host_vars/libvirt-ubuntu-1604/main.yml > > diff --git a/guests/host_vars/libvirt-ubuntu-1604/docker.yml b/guests/host_vars/libvirt-ubuntu-1604/docker.yml > deleted file mode 100644 > index 2d4eb25..0000000 > --- a/guests/host_vars/libvirt-ubuntu-1604/docker.yml > +++ /dev/null > @@ -1,2 +0,0 @@ > ---- > -docker_base: ubuntu:16.04 > diff --git a/guests/host_vars/libvirt-ubuntu-1604/install.yml b/guests/host_vars/libvirt-ubuntu-1604/install.yml > deleted file mode 100644 > index c3edf40..0000000 > --- a/guests/host_vars/libvirt-ubuntu-1604/install.yml > +++ /dev/null > @@ -1,2 +0,0 @@ > ---- > -install_url: http://archive.ubuntu.com/ubuntu/dists/xenial-updates/main/installer-amd64/ > diff --git a/guests/host_vars/libvirt-ubuntu-1604/main.yml b/guests/host_vars/libvirt-ubuntu-1604/main.yml > deleted file mode 100644 > index 4eca69b..0000000 > --- a/guests/host_vars/libvirt-ubuntu-1604/main.yml > +++ /dev/null > @@ -1,39 +0,0 @@ > ---- > -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-viewer > - > -os: > - name: 'Ubuntu' > - version: '1604' > - > -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 5fced6a..ff7a585 100644 > --- a/guests/inventory > +++ b/guests/inventory > @@ -10,6 +10,5 @@ libvirt-freebsd-11 > libvirt-freebsd-12 > 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 1c06408..6adc74e 100644 > --- a/guests/vars/mappings.yml > +++ b/guests/vars/mappings.yml > @@ -210,7 +210,6 @@ mappings: > rpm: glusterfs-api-devel > Debian9: glusterfs-common > OpenSUSE: glusterfs-devel > - Ubuntu1604: glusterfs-common > Ubuntu1804: glusterfs-common > cross-policy-deb: foreign > > @@ -245,7 +244,6 @@ mappings: > gtk-update-icon-cache: > default: gtk-update-icon-cache > OpenSUSE: gtk3-tools > - Ubuntu1604: libgtk2.0-bin > > hal: > FreeBSD: hal > @@ -276,7 +274,6 @@ mappings: > pkg: openjdk11 > rpm: java-11-openjdk-headless > Debian9: openjdk-8-jre-headless > - Ubuntu1604: openjdk-8-jre-headless > > json-glib: > deb: libjson-glib-dev > @@ -485,7 +482,6 @@ mappings: > CentOS7: > Debian9: > OpenSUSE151: > - Ubuntu1604: > Ubuntu1804: > > ninja: > @@ -876,7 +872,6 @@ mappings: > FreeBSD: py37-libxml2 > OpenSUSE: python3-libxml2-python > CentOS7: > - Ubuntu1604: > > python3-lxml: > default: python3-lxml > @@ -892,7 +887,6 @@ mappings: > CentOS7: python3-pip > Debian9: python3-pip > OpenSUSE151: python3-pip > - Ubuntu1604: python3-pip > Ubuntu1804: python3-pip > > python3-pytest: > @@ -952,7 +946,6 @@ mappings: > default: > Fedora: sheepdog > Debian9: sheepdog > - Ubuntu1604: sheepdog > Ubuntu1804: sheepdog > > showmount: > -- > 2.25.4 > 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 :|
