Merge pull request #660 from voxpupuli/puppet7

Drop Puppet 6 support
voxpupuli · May 10, 2023 · e70680a · e70680a
2 parents ad83fb8 + 1f4b06e
commit e70680a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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/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": [

diff --git 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