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

Re-enable bolt tests on RedHat 9 #519

Closed
wants to merge 1 commit into from
+6 −5
Closed

Re-enable bolt tests on RedHat 9 #519

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 metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"11"
"11",
"12"
Copy link
Member

Choose a reason for hiding this comment

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

This looks unrelated

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, hence the fixes line in MR. Can split up more if needs be.

Copy link
Member

Choose a reason for hiding this comment

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

Perhaps at least split up the commits?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will rebase after #520 - may as well do two MR if two commits and make it obvious what is going on.

]
},
{
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/redis_cli_task_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

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

unless fact('os.family') == 'RedHat' && fact('os.release.major').to_i >= 9
unless fact('os.name') == 'Debian' && fact('os.release.major').to_i >= 12

include_examples 'an idempotent resource' do
let(:manifest) { 'include redis' }
end
Expand Down
5 changes: 2 additions & 3 deletions spec/spec_helper_acceptance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
# 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
unless fact_on(host, 'os.name') == 'Debian' && fact_on(host, 'os.release.major').to_i >= 12
# puppet-bolt for Debian 12 is not yet available
host.install_package('puppet-bolt')
end

Expand Down