diff --git a/metadata.json b/metadata.json index 2ecce7d1..61b34cdf 100644 --- a/metadata.json +++ b/metadata.json @@ -65,7 +65,6 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "14.04", "16.04", "18.04" ] diff --git a/provision.yaml b/provision.yaml index 96b60366..0c0f910e 100644 --- a/provision.yaml +++ b/provision.yaml @@ -4,7 +4,7 @@ default: images: ['waffleimage/centos7'] waffle_deb: provisioner: docker_exp - images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04'] + images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04'] waffle_el6: provisioner: docker_exp images: ['waffleimage/centos6', 'waffleimage/scientificlinux6'] @@ -16,4 +16,4 @@ vagrant: images: ['centos/7', 'generic/ubuntu1804'] release_checks: provisioner: vmpooler - images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64'] + images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'sles-15-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']