Skip to content

Commit f37052d

Browse files
committed
enable beaker multihost acceptance testing
1 parent d0416b4 commit f37052d

File tree

7 files changed

+26
-14
lines changed

7 files changed

+26
-14
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,24 @@
44

55
name: CI
66

7-
"on": pull_request
7+
# yamllint disable-line rule:truthy
8+
on:
9+
pull_request: {}
10+
push:
11+
branches:
12+
- main
13+
- master
814

915
concurrency:
1016
group: ${{ github.ref_name }}
1117
cancel-in-progress: true
1218

19+
permissions:
20+
contents: read
21+
1322
jobs:
1423
puppet:
1524
name: Puppet
16-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
25+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
1726
with:
18-
pidfile_workaround: 'false'
27+
beaker_hosts: master;replica;client

.sync.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ spec/spec_helper_acceptance.rb:
2020
delete: true
2121
.github/workflows/markdownlint.yaml:
2222
delete: true
23+
24+
.github/workflows/ci.yml:
25+
with:
26+
beaker_hosts: master,replica,client

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ group :test do
77
gem 'voxpupuli-test', '~> 7.0', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
10-
gem 'puppet_metadata', '~> 3.5', :require => false
10+
gem 'puppet_metadata', '~> 5.0', :require => false
1111
end
1212

1313
group :development do

examples/client.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
domain => 'example.com',
77
domain_join_principal => 'admin',
88
domain_join_password => 'rspecrspec123',
9-
ipa_master_fqdn => 'master.example.com',
9+
ipa_master_fqdn => 'master-puppet8.example.com',
1010
configure_ntp => false, # chronyd usually fails under gha
1111
}

examples/replica.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-> class { 'ipa':
66
ipa_role => 'replica',
77
domain => 'example.com',
8-
ipa_master_fqdn => 'master.example.com',
8+
ipa_master_fqdn => 'master-puppet8.example.com',
99
admin_password => 'rspecrspec123',
1010
configure_dns_server => false,
1111
configure_ntp => false,

spec/acceptance/master_spec.rb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44

55
# server/replica is only supported on Redhat
66
if fact_on('master', 'os.family') == 'RedHat'
7-
describe 'easy_ipa class' do
7+
describe 'ipa master' do
88
include_examples 'the example', 'master.pp', 'master'
99
end
10-
end
1110

12-
if fact_on('client', 'os.family') == 'RedHat'
13-
describe 'easy_ipa class' do
11+
# replica setup timesout under gha
12+
# describe 'ipa replica' do
13+
# include_examples 'the example', 'replica.pp', 'replica'
14+
# end
15+
16+
describe 'ipa client' do
1417
include_examples 'the example', 'client.pp', 'client'
1518
end
1619
end

spec/support/acceptance/setup.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
configure_beaker(modules: :metadata) do |host|
44
on(host, 'sysctl -w net.ipv6.conf.lo.disable_ipv6=0')
5-
# disable sticky bit owner enforcement for ipa 4.6/EL7
6-
# https://bugzilla.redhat.com/show_bug.cgi?id=1677027
7-
# https://pagure.io/freeipa/c/87496d647706462fa8a10bbea5637104153146b2
8-
on(host, 'sysctl -w fs.protected_regular=0')
95
install_puppet_module_via_pmt_on(host, 'puppet/cron')
106
install_puppet_module_via_pmt_on(host, 'puppet/epel')
117
end

0 commit comments

Comments
 (0)