From: lionce <42546087+lionce@users.noreply.github.com>
Date: Thu, 7 Nov 2019 12:40:39 +0000 (+0200)
Subject: Merge pull request #888 from glennsarti/fix-travis
X-Git-Tag: v7.3.0~8
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1161179b4b8b41862b4321f7b83f0d29199544d3;hp=8355ea099a6d5910a92e52116f4ebcbc160cfd67;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #888 from glennsarti/fix-travis

(PDK-1501) Fix acceptance stages in Travis CI
---

diff --git a/metadata.json b/metadata.json
index 7b237ed..df1cdf0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -29,7 +29,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04"
       ]
diff --git a/provision.yaml b/provision.yaml
index 3fb28c0..00147dc 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -4,13 +4,13 @@ default:
   images: ['waffleimage/debian8']
 travis_deb:
   provisioner: docker
-  images: ['debian:8', 'debian:9', 'ubuntu:14.04', 'ubuntu:16.04', 'ubuntu:18.04']
+  images: ['debian:8', 'debian:9', 'ubuntu:16.04', 'ubuntu:18.04']
 waffle_deb:
   provisioner: docker 
-  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']
 vagrant:
   provisioner: vagrant
   images: ['centos/7', 'generic/ubuntu1804']
 release_checks:
   provisioner: vmpooler
-  images: ['debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
+  images: ['debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']