From 2f86fcb4a2b6e2d0ebd08d335f9b1e3a9bc6688e Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Wed, 11 Oct 2023 22:11:24 -0500 Subject: [PATCH] [puppetsync] Updates for Puppet 8 These updates may include the following: * Update Gemfile * Add support for Puppet 8 * Drop support for Puppet 6 * Update module dependencies --- .github/workflows/tag_deploy.yml | 4 ++-- CHANGELOG | 8 ++++++++ Gemfile | 34 ++++++++++++++++---------------- metadata.json | 12 +++++------ spec/spec_helper.rb | 2 +- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/.github/workflows/tag_deploy.yml b/.github/workflows/tag_deploy.yml index c98aa19..2191ab1 100644 --- a/.github/workflows/tag_deploy.yml +++ b/.github/workflows/tag_deploy.yml @@ -120,10 +120,10 @@ jobs: IS_PRERELASE: ${{ steps.tag-check.outputs.prerelease }} run: | echo "${RELEASE_MESSAGE}" > /tmp/.commit-msg.txt - args=(--file /tmp/.commit-msg.txt) + args=(-F /tmp/.commit-msg.txt) [[ $IS_PRERELASE == yes ]] && args+=(--prerelease) - hub release create ${args[@]} "$TARGET_TAG" + gh release create ${args[@]} "$TARGET_TAG" build-and-attach-rpms: name: Trigger RPM release diff --git a/CHANGELOG b/CHANGELOG index 46cedf0..77d539f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +* Wed Oct 11 2023 Steven Pritchard - 6.7.0 +- [puppetsync] Updates for Puppet 8 + - These updates may include the following: + - Update Gemfile + - Add support for Puppet 8 + - Drop support for Puppet 6 + - Update module dependencies + * Thu Sep 07 2023 Steven Pritchard - 6.6.0 - Add AlmaLinux 8 support diff --git a/Gemfile b/Gemfile index 7a27a01..e74c3da 100644 --- a/Gemfile +++ b/Gemfile @@ -4,28 +4,28 @@ # This file is automatically updated as part of a puppet module baseline. # The next baseline sync will overwrite any local changes made to this file. # ------------------------------------------------------------------------------ -gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/) +gem_sources = ENV.fetch('GEM_SERVERS', 'https://rubygems.org').split(%r{[, ]+}) ENV['PDK_DISABLE_ANALYTICS'] ||= 'true' gem_sources.each { |gem_source| source gem_source } group :test do - puppet_version = ENV['PUPPET_VERSION'] || '~> 8' - major_puppet_version = puppet_version.scan(/(\d+)(?:\.|\Z)/).flatten.first.to_i - gem 'rake' - gem 'puppet', puppet_version - gem 'rspec' - gem 'rspec-puppet' + puppet_version = ENV.fetch('PUPPET_VERSION', ['>= 7', '< 9']) + major_puppet_version = Array(puppet_version).first.scan(%r{(\d+)(?:\.|\Z)}).flatten.first.to_i gem 'hiera-puppet-helper' - gem 'puppetlabs_spec_helper' gem 'metadata-json-lint' - gem 'puppet-strings' - gem 'puppet-lint-trailing_comma-check', :require => false - gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.7' - gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.21.0', '< 6'] - gem( 'pdk', ENV['PDK_VERSION'] || ['>= 2.0', '< 4.0'], :require => false) if major_puppet_version > 5 gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem('pdk', ENV.fetch('PDK_VERSION', ['>= 2.0', '< 4.0']), require: false) if major_puppet_version > 5 + gem 'puppet', puppet_version + gem 'puppetlabs_spec_helper' + gem 'puppet-lint-trailing_comma-check', require: false + gem 'puppet-strings' + gem 'rake' + gem 'rspec' + gem 'rspec-puppet' + gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.21.0', '< 6']) + gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 3.7') end group :development do @@ -35,21 +35,21 @@ group :development do end group :system_tests do + gem 'bcrypt_pbkdf' gem 'beaker' gem 'beaker-rspec' - gem 'simp-beaker-helpers', ENV['SIMP_BEAKER_HELPERS_VERSION'] || ['>= 1.32.1', '< 2'] - gem 'bcrypt_pbkdf' + gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.32.1', '< 2']) end # Evaluate extra gemfiles if they exist extra_gemfiles = [ - ENV['EXTRA_GEMFILE'] || '', + ENV.fetch('EXTRA_GEMFILE', ''), "#{__FILE__}.project", "#{__FILE__}.local", File.join(Dir.home, '.gemfile'), ] extra_gemfiles.each do |gemfile| if File.file?(gemfile) && File.readable?(gemfile) - eval(File.read(gemfile), binding) + eval(File.read(gemfile), binding) # rubocop:disable Security/Eval end end diff --git a/metadata.json b/metadata.json index 78f193c..2d5758d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-dhcp", - "version": "6.6.0", + "version": "6.7.0", "author": "SIMP Team", "summary": "A Puppet module to automate configuration of DHCP", "license": "Apache-2.0", @@ -18,23 +18,23 @@ }, { "name": "simp/iptables", - "version_requirement": ">= 6.4.0 < 7.0.0" + "version_requirement": ">= 6.5.3 < 7.0.0" }, { "name": "simp/simplib", - "version_requirement": ">= 3.5.0 < 5.0.0" + "version_requirement": ">= 4.9.0 < 5.0.0" }, { "name": "simp/logrotate", - "version_requirement": ">= 6.1.0 < 7.0.0" + "version_requirement": ">= 6.5.0 < 7.0.0" }, { "name": "simp/rsyslog", - "version_requirement": ">= 7.0.0 < 9.0.0" + "version_requirement": ">= 7.6.0 < 9.0.0" }, { "name": "simp/rsync", - "version_requirement": ">= 6.0.0 < 7.0.0" + "version_requirement": ">= 6.1.1 < 7.0.0" } ], "operatingsystem_support": [ diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f2014d0..50cf8b0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -92,7 +92,7 @@ def set_hieradata(hieradata) c.mock_with :mocha c.module_path = File.join(fixture_path, 'modules') - c.manifest_dir = File.join(fixture_path, 'manifests') + c.manifest_dir = File.join(fixture_path, 'manifests') if c.respond_to?(:manifest_dir) c.hiera_config = File.join(fixture_path,'hieradata','hiera.yaml')