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.

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

Use bolt_supported beaker helper #521

Merged
merged 2 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
Gemfile:
optional:
':system_tests':
- gem: 'voxpupuli-acceptance'
version: '~> 3.1'
':test':
- gem: 'redis'
- gem: 'mock_redis'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ group :development do
end

group :system_tests do
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
gem 'voxpupuli-acceptance', '~> 3.1', :require => false
end

group :release do
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/redis_cli_task_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

let(:task_name) { 'redis::redis_cli' }

unless fact('os.family') == 'RedHat' && fact('os.release.major').to_i >= 9
if bolt_supported?
include_examples 'an idempotent resource' do
let(:manifest) { 'include redis' }
end
Expand Down
6 changes: 1 addition & 5 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
# sysctl is untestable in docker
install_puppet_module_via_pmt_on(host, 'puppet-augeasproviders_sysctl') unless host['hypervisor'] == 'docker'

unless fact_on(host, 'os.family') == 'RedHat' && fact_on(host, 'os.release.major').to_i >= 9
# puppet-bolt rpm for CentOS 9 is not yet available
# https://tickets.puppetlabs.com/browse/MODULES-11275
host.install_package('puppet-bolt')
end
host.install_package('puppet-bolt') if bolt_supported?(host)

if fact_on(host, 'os.family') == 'Debian'
# APT required for Debian based systems where `$redis::manage_repo` is `true`
Expand Down