Skip to content

Commit 765a1e1

Browse files
committed
Test docker_podman support in beaker
1 parent 68b391e commit 765a1e1

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818
jobs:
1919
puppet:
2020
name: Puppet
21-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
21+
uses: bastelfreak/gha-puppet/.github/workflows/beaker.yml@podman
2222
with:
23-
pidfile_workaround: 'false'
2423
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0'
24+
beaker_hypervisor: 'docker_podman'

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ group :development do
1818
end
1919

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

spec/spec_helper_acceptance.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
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'
1010
end
1111

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

spec/support/acceptance/supported_versions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
def supported_versions
4-
supported_versions = %w[5.0 6.0]
4+
supported_versions = %w[5.0 6.0 6.4]
55
# this is a hack so that we don't have to rewrite the existing acceptance tests
66
if (beaker_zabbix_version = ENV.fetch('BEAKER_FACTER_zabbix_version', nil))
77
supported_versions &= [beaker_zabbix_version]

0 commit comments

Comments
 (0)