Skip to content

Commit 7761917

Browse files
authored
Update supported versions of Puppet and OS versions (#5)
1 parent 0a4280a commit 7761917

File tree

4 files changed

+15
-49
lines changed

4 files changed

+15
-49
lines changed

metadata.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
{
1515
"operatingsystem": "CentOS",
1616
"operatingsystemrelease": [
17-
"6",
18-
"7"
17+
"7",
18+
"8"
1919
]
2020
},
2121
{
@@ -28,8 +28,8 @@
2828
{
2929
"operatingsystem": "RedHat",
3030
"operatingsystemrelease": [
31-
"6",
32-
"7"
31+
"7",
32+
"8"
3333
]
3434
},
3535
{
@@ -48,15 +48,14 @@
4848
{
4949
"operatingsystem": "Ubuntu",
5050
"operatingsystemrelease": [
51-
"14.04",
52-
"16.04",
53-
"18.04"
51+
"18.04",
52+
"20.04"
5453
]
5554
},
5655
{
5756
"operatingsystem": "Fedora",
5857
"operatingsystemrelease": [
59-
"25"
58+
"37"
6059
]
6160
},
6261
{
@@ -81,7 +80,7 @@
8180
"requirements": [
8281
{
8382
"name": "puppet",
84-
"version_requirement": ">= 4.7.0 < 7.0.0"
83+
"version_requirement": ">= 4.7.0 < 8.0.0"
8584
}
8685
],
8786
"pdk-version": "1.8.0",

spec/acceptance/nodesets/default.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
---
2-
32
HOSTS:
4-
centos-7-x64:
5-
platform: el-7-x86_64
6-
image: centos:7
3+
ubuntu-1804-x64:
4+
platform: ubuntu-18.04-amd64
75
hypervisor: docker
6+
image: ubuntu:18.04
87
docker_preserve_image: true
9-
docker_cmd: '["/usr/sbin/init"]'
10-
ubuntu-1404-x64:
11-
platform: ubuntu-14.04-amd64
8+
ubuntu-2004-x64:
9+
platform: ubuntu-20.04-amd64
1210
hypervisor: docker
13-
image: ubuntu:14.04
11+
image: ubuntu:20.04
1412
docker_preserve_image: true
15-
docker_cmd: '["/sbin/init"]'
16-
docker_image_commands:
17-
# ensure that upstart is booting correctly in the container
18-
- >
19-
rm /usr/sbin/policy-rc.d &&
20-
rm /sbin/initctl &&
21-
dpkg-divert --rename --remove /sbin/initctl &&
22-
apt-get update &&
23-
apt-get install -y net-tools wget &&
24-
locale-gen en_US.UTF-8
2513
CONFIG:
2614
type: foss
2715
trace_limit: 200

spec/acceptance/nodesets/ubuntu-1404-x64.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

spec/unit/puppet/type/filepath_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
end
2626

2727
it 'accepts filemode' do
28-
expect(resource[:mode]).to eq('770')
28+
expect(resource[:mode]).to eq('0770')
2929
end
3030

3131
it 'expects a name' do

0 commit comments

Comments
 (0)