drop EOL Ubuntu 14.04

voxpupuli · Nov 14, 2019 · be3a887 · be3a887
1 parent 001f813
commit be3a887
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -4,5 +4,4 @@
   docker_sets:
   - set: debian8-64
   - set: debian9-64
-  - set: ubuntu1404-64
   - set: ubuntu1604-64
diff --git a/.travis.yml b/.travis.yml
@@ -39,14 +39,6 @@ matrix:
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-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=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/manifests/params.pp b/manifests/params.pp
@@ -10,7 +10,7 @@
       $package_name_v4  = 'bird'
       # Compatibility for Debian oldstable and Ubuntu old LTS
       # the bird package now provides bird and bird6 daemons
-      if ($facts['os']['name'] == 'ubuntu' and $facts['lsbdistcodename'] in ['precise', 'trusty']) or
+      if ($facts['lsbdistcodename'] == 'precise') or
       ($facts['os']['name'] == 'debian' and $facts['os']['release']['major'] in ['7', '8']) {
         $package_name_v6  = 'bird6'
       } else {

diff --git a/metadata.json b/metadata.json
@@ -18,7 +18,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04"
       ]
     }