Merge pull request voxpupuli#515 from bastelfreak/ubuntu

bastelfreak · web-flow · commit 461a8fa54041 · 2019-11-26T11:57:17.000+01:00
drop Ubuntu 14.04 support
diff --git a/.sync.yml b/.sync.yml
@@ -2,7 +2,6 @@
 .travis.yml:
   secure: "bBDDSSz8OQwK0zxJ4EjM01bE4uoNMzTXyxp2lllXdv6PYAJCI4bCCcdRF7OKLAWaRtm6c0HJGnfMXzmwqHF/pJSUZzfTGe4uwZrrmaGvdalP4fXtLWpviAoez8La0Nx7JYqwPPprP7nySBD8M3rUuOZJetXQM6yGgj4YSs2lKMo="
   docker_sets:
-    - set: ubuntu1404-64
     - set: ubuntu1604-64
     - set: ubuntu1804-64
     - set: debian8-64
diff --git a/.travis.yml b/.travis.yml
@@ -23,14 +23,6 @@ matrix:
   - rvm: 2.4.4
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
-    services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
diff --git a/metadata.json b/metadata.json
@@ -42,7 +42,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04"
       ]

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@`
`42`	`42`	`{`
`43`	`43`	`"operatingsystem": "Ubuntu",`
`44`	`44`	`"operatingsystemrelease": [`
`45`		`- "14.04",`
`46`	`45`	`"16.04",`
`47`	`46`	`"18.04"`
`48`	`47`	`]`