Skip to content

Commit

Permalink
Drop EL7, Require stdlib 9.x, support newer dependencies (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
treydock authored Oct 22, 2024
1 parent 37d09b0 commit 469e398
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ spec/acceptance/nodesets/ubuntu-2004.yml:
delete: true
spec/acceptance/nodesets/ubuntu-2204.yml:
delete: true
spec/acceptance/nodesets/ubuntu-2404.yml:
delete: true
15 changes: 4 additions & 11 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.13.1 <9.0.0"
"version_requirement": ">= 9.0.0 <10.0.0"
},
{
"name": "puppet/augeasproviders_shellvar",
"version_requirement": ">= 5.0.0 <6.0.0"
"version_requirement": ">= 5.0.0 <7.0.0"
},
{
"name": "puppet/systemd",
"version_requirement": ">= 0.3.0 <7.0.0"
"version_requirement": ">= 0.3.0 <8.0.0"
},
{
"name": "saz/rsyslog",
Expand All @@ -33,17 +33,10 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"7",
"8",
"9"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7"
]
},
{
"operatingsystem": "Rocky",
"operatingsystemrelease": [
Expand Down Expand Up @@ -73,5 +66,5 @@
],
"pdk-version": "2.7.1",
"template-url": "https://github.com/treydock/pdk-templates.git#master",
"template-ref": "heads/master-0-gc7a6913"
"template-ref": "heads/master-0-gd2de99e"
}
4 changes: 2 additions & 2 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
Dir["#{dir}/acceptance/shared_examples/**/*.rb"].sort.each { |f| require f }
require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))

run_puppet_install_helper unless ENV['BEAKER_set'] == 'debian-12'
on hosts, 'apt install -y puppet-agent' if ENV['BEAKER_set'] == 'debian-12'
run_puppet_install_helper unless ['debian-12', 'ubuntu-2404'].include?(ENV['BEAKER_set'])
on hosts, 'apt install -y puppet-agent' if ['debian-12', 'ubuntu-2404'].include?(ENV['BEAKER_set'])
install_module_on(hosts)
install_module_dependencies_on(hosts)

Expand Down

0 comments on commit 469e398

Please sign in to comment.