From cfa581b1474678c36fe81390cb26cbac65a4b5a5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 17 Mar 2024 18:57:19 +0100 Subject: [PATCH] Test docker_podman support in beaker --- .github/workflows/ci.yml | 3 ++- Gemfile | 2 ++ spec/spec_helper_acceptance.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b15be20a..190309d90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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' diff --git a/Gemfile b/Gemfile index fb1e77619..ee223d957 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 6d8f82bda..ed30b904d 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -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 }