From 5208433533a495c615a9cf6004646bed3b3067a1 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 28 Apr 2024 22:18:09 +0200 Subject: [PATCH 1/2] Use bolt_supported beaker helper 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. --- spec/acceptance/redis_cli_task_spec.rb | 2 +- spec/spec_helper_acceptance.rb | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spec/acceptance/redis_cli_task_spec.rb b/spec/acceptance/redis_cli_task_spec.rb index 5e74218e..ebcc8bdc 100644 --- a/spec/acceptance/redis_cli_task_spec.rb +++ b/spec/acceptance/redis_cli_task_spec.rb @@ -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 diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index ba35a2f6..970060d0 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -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` From c076780680097c09605e71312ebd3d223dc2463c Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 2 May 2024 11:24:33 +0200 Subject: [PATCH 2/2] Require 3.1 --- .sync.yml | 3 +++ Gemfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.sync.yml b/.sync.yml index 4b30250d..22620a8c 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,6 +1,9 @@ --- Gemfile: optional: + ':system_tests': + - gem: 'voxpupuli-acceptance' + version: '~> 3.1' ':test': - gem: 'redis' - gem: 'mock_redis' diff --git a/Gemfile b/Gemfile index 8a6f66c7..8a0c5258 100644 --- a/Gemfile +++ b/Gemfile @@ -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