Skip to content

Commit

Permalink
Use bolt_supported beaker helper
Browse files Browse the repository at this point in the history
Use new bolt_supported helper to conditionally setup and run
beaker tests.

Since bolt is available for RHEL9 at the time of writing this will
enable bolt tests for RHEL9.
  • Loading branch information
traylenator committed May 2, 2024
1 parent 584e231 commit 5208433
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
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

0 comments on commit 5208433

Please sign in to comment.