Skip to content

Commit 99386b5

Browse files
committed
WIP beaker_hosts
1 parent 2095d80 commit 99386b5

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +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: jhoblitt/gha-puppet/.github/workflows/beaker.yml@feature/metadata2gha-multihost
25+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
1726
with:
18-
hosts: master,replica,client
19-
pidfile_workaround: 'false'
27+
beaker_hosts: master;replica;client

.sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ spec/spec_helper_acceptance.rb:
2323

2424
.github/workflows/ci.yml:
2525
with:
26-
hosts: master,replica,client
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', ref: 'f89cb24', :require => false, git: 'https://github.com/voxpupuli/puppet_metadata'
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
include_examples 'the example', 'master.pp', 'master'
99
end
1010

11-
describe 'ipa replica' do
12-
include_examples 'the example', 'replica.pp', 'replica'
13-
end
11+
# describe 'ipa replica' do
12+
# include_examples 'the example', 'replica.pp', 'replica'
13+
# end
1414

1515
describe 'ipa client' do
1616
include_examples 'the example', 'client.pp', 'client'

0 commit comments

Comments
 (0)