From 912bf54d2fceea5078e200413d40ca98de37eccb Mon Sep 17 00:00:00 2001 From: Sam Pearson Date: Fri, 29 Sep 2023 17:06:33 +0100 Subject: [PATCH 1/2] Fix tests for Oracle Linux Oracle Linux needs for both EPEL and the optional repository to be enabled in order to successfully install the Nagios plugins package. This commit ensures that these are installed and configured for the acceptance tests. --- README.md | 4 ++++ spec/spec_helper_acceptance.rb | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index cb715f7..623676e 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index cfe7a5d..4287139 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -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 From b76c4414cefd16a90d21bc4dae3f552d4905d6fb Mon Sep 17 00:00:00 2001 From: Sam Pearson Date: Thu, 28 Sep 2023 09:53:14 +0100 Subject: [PATCH 2/2] puppetlabs/concat: Allow 9.x --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 8efee91..f6383d7 100644 --- a/metadata.json +++ b/metadata.json @@ -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",