diff --git a/.sync.yml b/.sync.yml index 39882ff..84aff7a 100644 --- a/.sync.yml +++ b/.sync.yml @@ -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 diff --git a/metadata.json b/metadata.json index 4a5953b..1104b98 100644 --- a/metadata.json +++ b/metadata.json @@ -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", @@ -33,17 +33,10 @@ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "7", "8", "9" ] }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7" - ] - }, { "operatingsystem": "Rocky", "operatingsystemrelease": [ @@ -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" } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 09cf9fa..be13d86 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -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)