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 Mar 17, 2024
1 parent 68b391e commit 765a1e1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:
jobs:
puppet:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
uses: bastelfreak/gha-puppet/.github/workflows/beaker.yml@podman
with:
pidfile_workaround: 'false'
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0'
beaker_hypervisor: 'docker_podman'
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 }
2 changes: 1 addition & 1 deletion spec/support/acceptance/supported_versions.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

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

0 comments on commit 765a1e1

Please sign in to comment.