Skip to content

Commit e77c3f0

Browse files
committed
Add Fedora 31, drop Fedora 26
Fedora 26 is EOL. Fedora 32 is not added since there are no packages available.
1 parent 1222b80 commit e77c3f0

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

.sync.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- centos6-64
55
- debian9-64
66
- debian10-64
7+
- fedora31-64
78
- ubuntu1804-64
89
env:
910
global:

.travis.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,28 @@ matrix:
6767
- echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
6868
- sudo service docker restart
6969

70+
- rvm: 2.5.1
71+
env:
72+
- BEAKER_PUPPET_COLLECTION=puppet5
73+
- BEAKER_setfile=fedora31-64{hostname=fedora31-64.example.com}
74+
script: bundle exec rake beaker
75+
services: docker
76+
bundler_args: --without development
77+
before_install:
78+
- echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
79+
- sudo service docker restart
80+
81+
- rvm: 2.5.1
82+
env:
83+
- BEAKER_PUPPET_COLLECTION=puppet6
84+
- BEAKER_setfile=fedora31-64{hostname=fedora31-64.example.com}
85+
script: bundle exec rake beaker
86+
services: docker
87+
bundler_args: --without development
88+
before_install:
89+
- echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
90+
- sudo service docker restart
91+
7092
- rvm: 2.5.1
7193
env:
7294
- BEAKER_PUPPET_COLLECTION=puppet5

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
{
6666
"operatingsystem": "Fedora",
6767
"operatingsystemrelease": [
68-
"26"
68+
"31"
6969
]
7070
},
7171
{

spec/setup_acceptance_node.pp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
if $facts['os']['name'] == 'Ubuntu' {
2-
package { 'cron':
3-
ensure => installed,
4-
}
1+
$packages = $facts['os']['name'] ? {
2+
'Fedora' => ['cronie'],
3+
'Ubuntu' => ['cron'],
4+
default => [],
5+
}
6+
7+
package { $packages:
8+
ensure => installed,
59
}

0 commit comments

Comments
 (0)