From 04380c81bbd228159dd9d4f612c597bcead26426 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 31 Mar 2023 13:01:21 +0200 Subject: [PATCH 1/2] Test beaker-puppet_install_helper --- Gemfile | 6 +++++- spec/acceptance/postfix_exporter_spec.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index b3827ba7..7292160b 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,11 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 1.0', :require => false + 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' end group :release do diff --git a/spec/acceptance/postfix_exporter_spec.rb b/spec/acceptance/postfix_exporter_spec.rb index 10a00018..75db6275 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_module_from_forge('puppet/postfix', '>= 1.8.0 < 3.0.0') + install_puppet_module_via_pmt_on(host, 'puppet/postfix') end it do From 1f4b06e58bf99821de4082a257e5c651db68f33d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 28 Apr 2023 14:03:45 +0200 Subject: [PATCH 2/2] Drop Puppet 6 support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 9d9747d9..7418b75d 100644 --- a/metadata.json +++ b/metadata.json @@ -77,7 +77,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.1.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 8.0.0" } ], "tags": [