Skip to content

Commit

Permalink
Test docker_podman support in beaker
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Sep 20, 2024
1 parent 24993d4 commit cfa581b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ concurrency:
jobs:
puppet:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@podman
with:
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0,7.0'
beaker_hypervisor: 'docker_podman'
unit_runs_on: 'cern-self-hosted'
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ group :development do
end

group :system_tests do
gem 'beaker-hostgenerator', git: 'https://github.com/bastelfreak/beaker-hostgenerator', branch: 'podman'
gem 'beaker-docker', git: 'https://github.com/bastelfreak/beaker-docker', branch: 'foo'
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
end

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# In Puppet 7 the locale ends up being C.UTF-8 if it isn't passed.
# This locale doesn't exist in EL7 and won't be supported either.
# At least PostgreSQL runs into this.
ENV['LANG'] = 'en_US.UTF-8' if host['hypervisor'] == 'docker' && host['platform'] == 'el-7-x86_64'
ENV['LANG'] = 'en_US.UTF-8' if host['hypervisor'] =~ %r{docker} && host['platform'] == 'el-7-x86_64'
end

Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }

0 comments on commit cfa581b

Please sign in to comment.