Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test container_podman support in beaker #935

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Test container_podman support in beaker #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
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: evgeni/gha-puppet/.github/workflows/beaker.yml@podman
with:
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0,7.0'
beaker_hypervisor: 'container_podman'
unit_runs_on: 'cern-self-hosted'
1 change: 1 addition & 0 deletions .sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ spec/spec_helper.rb:
.github/workflows/ci.yml:
with:
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0,7.0'
beaker_hypervisor: 'container_podman'
unit_runs_on: 'cern-self-hosted'
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
View file
Open in desktop
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'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be =~ container? not sure what exactly is the value in hypervisor here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also don't know. I didn't pay too much attention because I want to merge #970 first, and that will remove the whole line anyways.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fair.

it still would be good to know as I think we use similar blocks in other modules too

end

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