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

Update puppetlabs-concat and fix tests on Oracle Linux #77

Merged
merged 2 commits into from
Oct 10, 2023
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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ This module has been documented with [puppet-strings](https://github.com/puppetl
* This module requires the EPEL repositories to be enabled
* This module currently does not manage the firewall rules

### Oracle Linux

* This module requires the EPEL and Optional Updates repositories to be enabled

### Solaris

* This module depends on OpenCSW packages
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": [
{
"name": "puppetlabs/concat",
"version_requirement": ">= 4.1.0 < 8.0.0"
"version_requirement": ">= 4.1.0 < 10.0.0"
},
{
"name": "puppetlabs/stdlib",
Expand Down
5 changes: 5 additions & 0 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

configure_beaker do |host|
install_package(host, 'epel-release') if fact_on(host, 'os.name') == 'CentOS'
if fact_on(host, 'os.name') == 'OracleLinux'
ver = fact_on(host, 'os.release.major')
install_package(host, "oracle-epel-release-el#{ver}")
on host, "yum-config-manager --enable ol#{ver}_optional_latest"
end
end

shared_examples 'an idempotent resource' do
Expand Down