Skip to content

Bump dependencies #968

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

Closed
wants to merge 4 commits into from
Closed

Bump dependencies #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49117d8
Bump dependency versions and add support for modern Debian and Ubuntu…
mj Dec 12, 2023
de20141
Remove usage of deprecated ensure_packages
bk-mj Dec 12, 2023
0c91440
Fix Python 2 package name for Debian und Ubuntu
bk-mj Dec 12, 2023
0734cf0
Fix test expectation on Debian systems
bk-mj Dec 12, 2023
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
1 change: 1 addition & 0 deletions data/family/Debian.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
rabbitmq::package_name: 'rabbitmq-server'
rabbitmq::service_name: 'rabbitmq-server'
rabbitmq::package_gpg_key: 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey'
rabbitmq::python_package: 'python2.7'
2 changes: 1 addition & 1 deletion manifests/install/rabbitmqadmin.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
$python_package = $rabbitmq::python_package
# Some systems (e.g., Ubuntu 16.04) don't ship Python 2 by default
if $rabbitmq::manage_python {
ensure_packages([$python_package])
stdlib::ensure_packages([$python_package])
$rabbitmqadmin_require = [Archive['rabbitmqadmin'], Package[$python_package]]
} else {
$rabbitmqadmin_require = Archive['rabbitmqadmin']
Expand Down
14 changes: 9 additions & 5 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10"
"10",
"11",
"12"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04"
"18.04",
"20.04",
"22.04"
]
},
{
Expand Down Expand Up @@ -58,15 +62,15 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.25.0 < 9.0.0"
"version_requirement": ">= 4.25.0 < 10.0.0"
},
{
"name": "puppet/archive",
"version_requirement": ">= 2.0.0 < 7.0.0"
"version_requirement": ">= 2.0.0 < 8.0.0"
},
{
"name": "puppet/systemd",
"version_requirement": ">= 2.10.0 < 5.0.0"
"version_requirement": ">= 2.10.0 < 7.0.0"
}
],
"tags": [
Expand Down
3 changes: 2 additions & 1 deletion spec/classes/rabbitmq_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@
is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
end

it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE Archlinux].include?(os_facts[:os]['family'])
it { is_expected.to contain_package('python') } if %w[RedHat SUSE Archlinux].include?(os_facts[:os]['family'])
it { is_expected.to contain_package('python2.7') } if %w[Debian].include?(os_facts[:os]['family'])
it { is_expected.to contain_package('python38') } if %w[FreeBSD].include?(os_facts[:os]['family'])
end

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
configure_beaker do |host|
case fact_on(host, 'os.family')
when 'Debian'
install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0')
install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 10.0.0')
when 'RedHat'
install_module_from_forge_on(host, 'garethr-erlang', '>= 0.3.0 < 1.0.0')
if fact_on(host, 'os.selinux.enabled')
Expand Down