File tree 3 files changed +4
-2
lines changed
3 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ concurrency:
19
19
jobs :
20
20
puppet :
21
21
name : Puppet
22
- uses : voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
22
+ uses : voxpupuli/gha-puppet/.github/workflows/beaker.yml@podman
23
23
with :
24
24
beaker_facter : ' zabbix_version:Zabbix:5.0,6.0,7.0'
25
+ beaker_hypervisor : ' docker_podman'
25
26
unit_runs_on : ' cern-self-hosted'
Original file line number Diff line number Diff line change @@ -14,4 +14,5 @@ spec/spec_helper.rb:
14
14
.github/workflows/ci.yml :
15
15
with :
16
16
beaker_facter : ' zabbix_version:Zabbix:5.0,6.0,7.0'
17
+ beaker_hypervisor : ' docker_podman'
17
18
unit_runs_on : ' cern-self-hosted'
Original file line number Diff line number Diff line change 6
6
# In Puppet 7 the locale ends up being C.UTF-8 if it isn't passed.
7
7
# This locale doesn't exist in EL7 and won't be supported either.
8
8
# At least PostgreSQL runs into this.
9
- ENV [ 'LANG' ] = 'en_US.UTF-8' if host [ 'hypervisor' ] == ' docker' && host [ 'platform' ] == 'el-7-x86_64'
9
+ ENV [ 'LANG' ] = 'en_US.UTF-8' if host [ 'hypervisor' ] =~ %r{ docker} && host [ 'platform' ] == 'el-7-x86_64'
10
10
end
11
11
12
12
Dir [ './spec/support/acceptance/**/*.rb' ] . sort . each { |f | require f }
You can’t perform that action at this time.
0 commit comments