From b8ae17f6bc23a567bc7c92c3f02d032956a99154 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 12 May 2023 13:16:19 +0200 Subject: [PATCH 1/3] modulesync 6.0.0 --- .msync.yml | 2 +- Gemfile | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.msync.yml b/.msync.yml index a4b00691..b929160c 100644 --- a/.msync.yml +++ b/.msync.yml @@ -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' diff --git a/Gemfile b/Gemfile index e272787e..98a04cfb 100644 --- a/Gemfile +++ b/Gemfile @@ -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 @@ -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 From 62643b9865a2506c58a847d9c79956fffe18fdc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 14 Jun 2023 14:34:39 -1000 Subject: [PATCH 2/3] Fix acceptance tests --- spec/acceptance/ipmi_exporter_spec.rb | 3 +-- spec/acceptance/nginx_prometheus_exporter_spec.rb | 4 ++-- spec/acceptance/postfix_exporter_spec.rb | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/acceptance/ipmi_exporter_spec.rb b/spec/acceptance/ipmi_exporter_spec.rb index 92483a0c..3623fb1c 100644 --- a/spec/acceptance/ipmi_exporter_spec.rb +++ b/spec/acceptance/ipmi_exporter_spec.rb @@ -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) diff --git a/spec/acceptance/nginx_prometheus_exporter_spec.rb b/spec/acceptance/nginx_prometheus_exporter_spec.rb index 427fc988..1192d1d4 100644 --- a/spec/acceptance/nginx_prometheus_exporter_spec.rb +++ b/spec/acceptance/nginx_prometheus_exporter_spec.rb @@ -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', diff --git a/spec/acceptance/postfix_exporter_spec.rb b/spec/acceptance/postfix_exporter_spec.rb index 75db6275..9a6cb028 100644 --- a/spec/acceptance/postfix_exporter_spec.rb +++ b/spec/acceptance/postfix_exporter_spec.rb @@ -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 From 3675a9aff99e1504c3c3af24e5b3122ab6cfea48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 14 Jun 2023 14:39:15 -1000 Subject: [PATCH 3/3] Drop Debian 9 (EOL) --- metadata.json | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata.json b/metadata.json index 7418b75d..64d0167f 100644 --- a/metadata.json +++ b/metadata.json @@ -57,7 +57,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "9", "10", "11" ]