Merge pull request #897 from puppetlabs/pdksync_pdksync-addubuntu14

MODULES-10242 Add ubuntu14 support back to the modules

diff --git a/metadata.json b/metadata.json
index 7fc5cc9175341d2d90097d0d09e8bde948562278..b48b42d2afb72dff9dc7f911d127972886375c54 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -29,6 +29,7 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
+        "14.04",
         "16.04",
         "18.04"
       ]

diff --git a/provision.yaml b/provision.yaml
index 00147dc9ed69cfc80414dcbd1216437b1c267ff7..fadfe699812bb8483dd450762399ddc075ab3905 100644 (file)
--- a/provision.yaml
+++ b/provision.yaml
@@ -7,10 +7,10 @@ travis_deb:
   images: ['debian:8', 'debian:9', 'ubuntu:16.04', 'ubuntu:18.04']
 waffle_deb:
   provisioner: docker 
-  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', '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-1604-x86_64', 'ubuntu-1804-x86_64']
+  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']