File tree Expand file tree Collapse file tree 3 files changed +4
-2
lines changed Expand file tree Collapse file tree 3 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ concurrency:
1919jobs :
2020 puppet :
2121 name : Puppet
22- uses : voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
22+ uses : voxpupuli/gha-puppet/.github/workflows/beaker.yml@podman
2323 with :
2424 beaker_facter : ' zabbix_version:Zabbix:5.0,6.0,7.0'
25+ beaker_hypervisor : ' docker_podman'
2526 unit_runs_on : ' cern-self-hosted'
Original file line number Diff line number Diff line change @@ -14,4 +14,5 @@ spec/spec_helper.rb:
1414.github/workflows/ci.yml :
1515 with :
1616 beaker_facter : ' zabbix_version:Zabbix:5.0,6.0,7.0'
17+ beaker_hypervisor : ' docker_podman'
1718 unit_runs_on : ' cern-self-hosted'
Original file line number Diff line number Diff line change 66 # In Puppet 7 the locale ends up being C.UTF-8 if it isn't passed.
77 # This locale doesn't exist in EL7 and won't be supported either.
88 # 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'
1010end
1111
1212Dir [ './spec/support/acceptance/**/*.rb' ] . sort . each { |f | require f }
You can’t perform that action at this time.
0 commit comments