Merge pull request #89 from 2ndquadrant-it/master

Add jail.conf.epp template for bionic
voxpupuli · Jan 18, 2019 · 0c12580 · 0c12580
2 parents e2a76a9 + 6383c29
commit 0c12580
Show file tree

Hide file tree

Showing 5 changed files with 1,003 additions and 2 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -7,3 +7,4 @@
     - set: debian8-64
     - set: debian9-64
     - set: ubuntu1604-64
+    - set: ubuntu1804-64
diff --git a/.travis.yml b/.travis.yml
@@ -95,6 +95,21 @@ matrix:
     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
     sudo: required
+  - rvm: 2.5.1
+    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
+    sudo: required
+  - rvm: 2.5.1
+    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
+    sudo: required
+  - rvm: 2.5.1
+    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
+    sudo: required
 branches:
   only:
   - master

diff --git a/README.md b/README.md
@@ -498,7 +498,7 @@ Users can add their own jails by using this YAML definition:
 This module has been tested on:
 
 * Debian 6/7/8
-* Ubuntu 12.04/14.04/16.04
+* Ubuntu 12.04/14.04/16.04/18.04
 * RedHat 5/6/7
 * CentOS 5/6/7
 

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