aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2020-05-19 21:32:49 +0200
committerGitHub <noreply@github.com>2020-05-19 21:32:49 +0200
commit8d967c7b915fec97846b1d6b567489646b3096a3 (patch)
treef18ecbf0fe3058d963044af44cef9824c47783d3
parent1924c40aa0d0a6b4f7ab209de1930d52c1169cde (diff)
parentce9bcd68b111bdb33978ad7994aeb3b7acf304ba (diff)
downloadpuppet-ferm-8d967c7b915fec97846b1d6b567489646b3096a3.tar.gz
puppet-ferm-8d967c7b915fec97846b1d6b567489646b3096a3.tar.bz2
Merge pull request #109 from bastelfreak/ubuntu20
Add Ubuntu 20.04 support
-rw-r--r--.sync.yml1
-rw-r--r--.travis.yml4
-rw-r--r--Gemfile2
-rw-r--r--metadata.json3
4 files changed, 8 insertions, 2 deletions
diff --git a/.sync.yml b/.sync.yml
index 4d38dc0..4bd4bb4 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,5 +7,6 @@
- set: centos7-64
- set: ubuntu1604-64
- set: ubuntu1804-64
+ - set: ubuntu2004-64
secure: "J7AG0AHVdEVql4c7cwJZCjbXFp5tehPnlS3REkUKu9s3Px+XRb+073W7hM2alfxB5Qo3mqyMdgyjIRMQyXXqfb54QmDG6Y1XfRIcNK/C6TL9JscC7rXN1gXJhrdZiQOtfXa3HFcWJkbsQrjnPbQ5y+
b5VdkzIthLkIa4IpQEYSQC5i88nDixF8dgApLGgC0CcmS+14iXZgJ2T89A7QiSbvhnIsszaIQucw91/Kled9mUT2cJlFrMXLfd3hycR/ftLJeBe6MvnlaflSqEWfz9UA7EW63JX13hhyNNaf26JsFyG7P7UiH6+dBGXX3xLPKeq032VysZzbmA1GFZYiGk0obAtqMlrfbcpsLceyg1FCku2/lv/6P9dkfjN0N0z7pgL0lGjjhN3lNwU997fIXq/tt3dxbXKFV2Ok16p/55VjV5i2U79bNTn6oZpqLzB6ZEc9WOb3DvBsLP5ooThSVtrZecTFZbjRFAT/Vd0nd/qIzdxEoaVVaSPOpaZf6v1Ojy3RMzSSOUdweDBNh0B+9p0tVDpiLhRYpAFbw1JH2X0dlPqtrKS+BNU8xwktfK5KGpvvfXdU+pWUKxP1MnzrmX5jDX3dIh7pkGRvaKSD5RTmufCVaR0neEBV3VERPPYLDKueGc3BgWtVqaEyZwuM5AMJJuWKkTIQsUPsXKbIqyP5c="
diff --git a/.travis.yml b/.travis.yml
index d490045..1080bb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,10 @@ jobs:
bundler_args: --without development release
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 CHECK=beaker
services: docker
+ - rvm: 2.5.3
+ bundler_args: --without development release
+ env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu2004-64 CHECK=beaker
+ services: docker
branches:
only:
- master
diff --git a/Gemfile b/Gemfile
index 32c3114..87db4f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
end
group :test do
- gem 'voxpupuli-test', '>= 1.0.0', :require => false
+ gem 'voxpupuli-test', '>= 1.4.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
end
diff --git a/metadata.json b/metadata.json
index 08032e3..6a114b2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -44,7 +44,8 @@
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"16.04",
- "18.04"
+ "18.04",
+ "20.04"
]
},
{