Skip to content

Commit 4c5c2a3

Browse files
ekohlmmoll
authored andcommitted
Add Fedora 31, drop Fedora 26
Fedora 26 is EOL. Fedora 32 is not added since there are no packages available. Because there are no server packages, a test just for the agent is added.
1 parent 1222b80 commit 4c5c2a3

10 files changed

+55
-9
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/acceptance/puppet_spec.rb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
require 'spec_helper_acceptance'
2+
3+
describe 'Scenario: install puppet' do
4+
before(:context) do
5+
on default, puppet('resource', 'service', 'puppet', 'ensure=stopped', 'enable=false')
6+
end
7+
8+
let(:pp) { 'include puppet' }
9+
10+
it_behaves_like 'a idempotent resource'
11+
12+
describe service('puppet') do
13+
it { is_expected.to be_running }
14+
it { is_expected.to be_enabled }
15+
end
16+
end

spec/acceptance/puppetserver_config_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper_acceptance'
22

3-
describe 'Puppetserver config options' do
3+
describe 'Puppetserver config options', unless: unsupported_puppetserver do
44
before(:context) do
55
if check_for_package(default, 'puppetserver')
66
on default, puppet('resource package puppetserver ensure=purged')

spec/acceptance/puppetserver_latest_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper_acceptance'
22

3-
describe 'Scenario: install puppetserver (latest):' do
3+
describe 'Scenario: install puppetserver (latest):', unless: unsupported_puppetserver do
44
before(:context) do
55
if check_for_package(default, 'puppetserver')
66
on default, puppet('resource package puppetserver ensure=purged')

spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper_acceptance'
22

3-
describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' do
3+
describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5', unless: unsupported_puppetserver do
44
before(:context) do
55
if check_for_package(default, 'puppetserver')
66
on default, puppet('resource package puppetserver ensure=purged')

spec/acceptance/puppetserver_upgrade_6_7_0_to_6_7_2_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper_acceptance'
22

3-
describe 'Scenario: 6.7.0 to 6.7.2 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6' do
3+
describe 'Scenario: 6.7.0 to 6.7.2 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6', unless: unsupported_puppetserver do
44
before(:context) do
55
if check_for_package(default, 'puppetserver')
66
on default, puppet('resource package puppetserver ensure=purged')

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
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
def unsupported_puppetserver
2+
host_inventory['facter']['os']['name'] == 'Fedora'
3+
end

0 commit comments

Comments
 (0)