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

Drop Debian 9 (EOL) #667

Merged
merged 3 commits into from Jun 22, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .msync.yml
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '5.5.0'
modulesync_config_version: '6.0.0'
17 changes: 7 additions & 10 deletions Gemfile
Expand Up @@ -4,10 +4,10 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 5.4', :require => false
gem 'voxpupuli-test', '~> 6.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 2.0', :require => false
gem 'puppet_metadata', '~> 3.0', :require => false
end

group :development do
Expand All @@ -16,22 +16,19 @@ group :development do
end

group :system_tests do
gem 'beaker', '~> 5.1'
gem 'beaker-puppet', git: 'https://github.com/bastelfreak/beaker-puppet', branch: 'eol'
gem 'beaker_puppet_helpers', git: 'https://github.com/bastelfreak/beaker_puppet_helpers', branch: 'ruby32'
gem 'beaker-module_install_helper'
gem 'voxpupuli-acceptance', git: 'https://github.com/bastelfreak/voxpupuli-acceptance', branch: 'drop-puppet-install-helper'
gem 'voxpupuli-acceptance', '~> 2.0', :require => false
end

group :release do
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
gem 'voxpupuli-release', '~> 2.0', :require => false
gem 'github_changelog_generator', '>= 1.16.1', :require => false
gem 'voxpupuli-release', '~> 3.0', :require => false
gem 'faraday-retry', '~> 2.1', :require => false
end

gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]

puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
gem 'puppet', puppetversion, :require => false, :groups => [:test]

# vim: syntax=ruby
1 change: 0 additions & 1 deletion metadata.json
Expand Up @@ -57,7 +57,6 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"9",
"10",
"11"
]
Expand Down
3 changes: 1 addition & 2 deletions spec/acceptance/ipmi_exporter_spec.rb
Expand Up @@ -4,8 +4,7 @@

describe 'prometheus ipmi exporter' do
it 'ipmi_exporter works idempotently with no errors' do
# TODO: Update to newer release once > 6.0.0 is released with https://github.com/saz/puppet-sudo/pull/268
on hosts, puppet('module', 'install', 'saz-sudo', '--version', '4.1.0')
shell('puppet module install saz-sudo')
pp = 'include prometheus::ipmi_exporter'
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/nginx_prometheus_exporter_spec.rb
Expand Up @@ -4,8 +4,8 @@

describe 'prometheus nginx exporter' do
it 'nginx_prometheus_exporter works idempotently with no errors' do
install_module_from_forge('puppetlabs/apt', '>= 8.2.0 < 9.0.0')
install_module_from_forge('puppet/nginx', '>= 3.2.1 < 4.0.0')
shell('puppet module install puppetlabs/apt')
shell('puppet module install puppet/nginx')
pp = <<-EOS
class { 'prometheus::nginx_prometheus_exporter':
scrape_uri => 'http://localhost:8888/stub_status',
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/postfix_exporter_spec.rb
Expand Up @@ -5,7 +5,7 @@
describe 'prometheus postfix exporter' do
describe 'install postfix' do
before do
install_puppet_module_via_pmt_on(host, 'puppet/postfix')
shell('puppet module install puppet/postfix')
end

it do
Expand Down