Merge pull request voxpupuli#1319 from Dan33l/add_ubuntu1804

add ubuntu1804 as supported OS
Rubueno · Mar 7, 2019 · 83406d4 · 83406d4
2 parents 4166296 + 6571959
commit 83406d4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -4,6 +4,7 @@
   docker_sets:
   - set: ubuntu1404-64
   - set: ubuntu1604-64
+  - set: ubuntu1804-64
   - set: centos7-64
   - set: debian8-64
   - set: debian9-64

diff --git a/.travis.yml b/.travis.yml
@@ -45,6 +45,18 @@ matrix:
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-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=ubuntu1804-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=ubuntu1804-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-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-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=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -107,7 +107,7 @@
       }
     }
     'Debian': {
-      if ($facts['os']['name'] == 'ubuntu' and $facts['lsbdistcodename'] in ['lucid', 'precise', 'trusty', 'xenial'])
+      if ($facts['os']['name'] == 'ubuntu' and $facts['lsbdistcodename'] in ['lucid', 'precise', 'trusty', 'xenial', 'bionic'])
       or ($facts['os']['name'] == 'debian' and $facts['os']['release']['major'] in ['6', '7', '8', '9']) {
         $_module_os_overrides = {
           'manage_repo' => true,

diff --git a/metadata.json b/metadata.json
@@ -66,7 +66,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     }
   ]

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -12,6 +12,8 @@
     pkg_match = case fact('operatingsystemmajrelease')
                 when '9'
                   %r{Debian Nginx Maintainers}
+                when '18.04'
+                  %r{Ubuntu Developers}
                 else
                   %r{Phusion}
                 end