From 41b88585cb581277697306bca2272b89b9b554cb Mon Sep 17 00:00:00 2001 From: markuszilch Date: Fri, 2 Feb 2024 14:59:54 +0100 Subject: [PATCH 1/7] modulesync 6.0.0 --- .msync.yml | 2 +- Gemfile | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.msync.yml b/.msync.yml index a4b0069..b929160 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 15313c3..978c57f 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,18 +16,19 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 1.0', :require => false + 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 '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 46a2dbf8721f51f73a824f2f53779f372b604cdf Mon Sep 17 00:00:00 2001 From: markuszilch Date: Fri, 2 Feb 2024 15:07:25 +0100 Subject: [PATCH 2/7] migrate to new installation method --- spec/spec_helper_acceptance.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 40b745a..bea7cf4 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -3,7 +3,7 @@ require 'voxpupuli/acceptance/spec_helper_acceptance' configure_beaker do |host| - install_module_from_forge_on(host, 'puppetlabs-puppetserver_gem', '>= 0') + install_puppet_module_via_pmt_on(host, 'puppetlabs-puppetserver_gem') unless ENV['BEAKER_provision'] == 'no' install_package(host, 'puppetserver') on host, puppet('resource', 'service', 'puppetserver', 'ensure=running') From 988363ff195bcd5b7edd183e2fe388fee415be1f Mon Sep 17 00:00:00 2001 From: markuszilch Date: Fri, 2 Feb 2024 16:18:37 +0100 Subject: [PATCH 3/7] replace on host, puppet() function --- spec/spec_helper_acceptance.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index bea7cf4..585e55b 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -6,7 +6,7 @@ install_puppet_module_via_pmt_on(host, 'puppetlabs-puppetserver_gem') unless ENV['BEAKER_provision'] == 'no' install_package(host, 'puppetserver') - on host, puppet('resource', 'service', 'puppetserver', 'ensure=running') + on host, 'puppet resource service puppetserver ensure=running' end end From 9c9f945cd02c74365ca45b69721ca06155bc9585 Mon Sep 17 00:00:00 2001 From: markuszilch Date: Tue, 6 Feb 2024 23:05:40 +0100 Subject: [PATCH 4/7] exchange no longer used puppet_user and puppet_group --- spec/spec_helper_acceptance.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 585e55b..b73a8f2 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -26,7 +26,11 @@ def wait_for_puppetserver(host, max_retries) def make_site_pp(host, pp, path) on host, "mkdir -p #{path}" create_remote_file(host, File.join(path, 'site.pp'), pp) - on host, "chown -R #{puppet_user(host)}:#{puppet_group(host)} #{path}" + if Facter.value('pe_server_version') + on host, "chown -R root:root #{path}" + else + on host, "chown -R puppet:puppet #{path}" + end on host, "chmod -R 0755 #{path}" on host, 'service puppetserver restart' wait_for_puppetserver(host, 3) From 2143cb61e7279bcee268af97f9b3640d3adc0e3a Mon Sep 17 00:00:00 2001 From: markuszilch Date: Wed, 7 Feb 2024 16:10:53 +0100 Subject: [PATCH 5/7] exchange no longer usable puppet function --- spec/acceptance/hiera_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/acceptance/hiera_spec.rb b/spec/acceptance/hiera_spec.rb index 2bac176..26adb79 100644 --- a/spec/acceptance/hiera_spec.rb +++ b/spec/acceptance/hiera_spec.rb @@ -84,7 +84,7 @@ class myclass { it 'finds it in puppet agent' do make_site_pp(default, pp, manifestsdir) - expect(on(default, puppet('agent', '-t', '--server', '$(hostname -f)'), acceptable_exit_codes: [0, 2]).stdout.strip).to match(%r{found output}) + expect(on(default, 'puppet agent -t --server $(hostname -f)', acceptable_exit_codes: [0, 2]).stdout.strip).to match(%r{found output}) end end end From ec12f324da66659727b34e9963f46720459041b6 Mon Sep 17 00:00:00 2001 From: markuszilch Date: Wed, 7 Feb 2024 16:33:02 +0100 Subject: [PATCH 6/7] add facts --- spec/spec_helper_acceptance.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index b73a8f2..065fdd8 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -24,6 +24,7 @@ def wait_for_puppetserver(host, max_retries) end def make_site_pp(host, pp, path) + let(:facts) on host, "mkdir -p #{path}" create_remote_file(host, File.join(path, 'site.pp'), pp) if Facter.value('pe_server_version') From 49c25867c24910c6c0fc7aeec76eb75e608b415d Mon Sep 17 00:00:00 2001 From: markuszilch Date: Wed, 7 Feb 2024 16:40:47 +0100 Subject: [PATCH 7/7] only test for opensource puppet --- spec/spec_helper_acceptance.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 065fdd8..085099c 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -24,14 +24,9 @@ def wait_for_puppetserver(host, max_retries) end def make_site_pp(host, pp, path) - let(:facts) on host, "mkdir -p #{path}" create_remote_file(host, File.join(path, 'site.pp'), pp) - if Facter.value('pe_server_version') - on host, "chown -R root:root #{path}" - else - on host, "chown -R puppet:puppet #{path}" - end + on host, "chown -R puppet:puppet #{path}" on host, "chmod -R 0755 #{path}" on host, 'service puppetserver restart' wait_for_puppetserver(host, 3)