From 6c2319747e629429c01f074ead312accea97e33c Mon Sep 17 00:00:00 2001 From: Craig Gumbley Date: Wed, 4 Jan 2023 13:02:40 +0000 Subject: [PATCH 1/4] (CONT-422) - Prep PDK version This commit bumps the version number of the PDK gem. --- lib/pdk/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pdk/version.rb b/lib/pdk/version.rb index a677696de..9a47fb988 100644 --- a/lib/pdk/version.rb +++ b/lib/pdk/version.rb @@ -1,4 +1,4 @@ module PDK - VERSION = '2.6.0-pre'.freeze - TEMPLATE_REF = '2.5.0'.freeze + VERSION = '2.6.0'.freeze + TEMPLATE_REF = '2.7.1'.freeze end From a5469ebfc5a7aa340a018ef78165785beef1139b Mon Sep 17 00:00:00 2001 From: Craig Gumbley Date: Fri, 6 Jan 2023 15:53:23 +0000 Subject: [PATCH 2/4] (CONT-422) - Bump testing dependencies This commit bumps some testing dependencies to ensure that the project is up to date with the build system. --- package-testing/Gemfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package-testing/Gemfile b/package-testing/Gemfile index 06877292f..beb2bee75 100644 --- a/package-testing/Gemfile +++ b/package-testing/Gemfile @@ -13,11 +13,11 @@ def location_for(place_or_version, fake_version = nil) end end -gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || 'https://github.com/voxpupuli/beaker.git#master') -gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.9.0') -gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '= 1.5.0') -gem 'beaker-puppet', '= 1.21.0' -gem 'beaker-rspec', '= 6.3.0' +gem 'beaker', '~> 4.38' +gem 'beaker-abs', '~> 0.11.0' +gem 'beaker-hostgenerator', '~> 1.18.0' +gem 'beaker-puppet', '= 1.29.0' +gem 'beaker-rspec', '= 7.1.0' gem 'beaker-vmpooler', '= 1.4.0' gem 'i18n', '= 1.4.0' # pin for Ruby 2.1 support gem 'nokogiri', '~> 1.10.8' From c55fd481ab3abc23e1274b644cd80797ae6e5cc6 Mon Sep 17 00:00:00 2001 From: Craig Gumbley Date: Mon, 9 Jan 2023 11:31:29 +0000 Subject: [PATCH 3/4] (CONT-422) - Bump Puppet versions This commit ensures that we are testing against newer versions of Puppet. --- package-testing/spec/package/version_selection_spec.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package-testing/spec/package/version_selection_spec.rb b/package-testing/spec/package/version_selection_spec.rb index 0d40b02e2..29e5707b3 100644 --- a/package-testing/spec/package/version_selection_spec.rb +++ b/package-testing/spec/package/version_selection_spec.rb @@ -6,12 +6,11 @@ { envvar: 'PDK_PUPPET_VERSION', version: '5.5.0', expected_puppet: '5.5', expected_ruby: '2.4' }, { envvar: 'PDK_PUPPET_VERSION', version: '6.21.0', expected_puppet: '6.21', expected_ruby: '2.5.9' }, { envvar: 'PDK_PUPPET_VERSION', version: '6.23.0', expected_puppet: '6.23', expected_ruby: '2.5.9' }, - { envvar: 'PDK_PUPPET_VERSION', version: '7.4.1', expected_puppet: '7.4', expected_ruby: '2.7.6' }, - { envvar: 'PDK_PUPPET_VERSION', version: '7.8.0', expected_puppet: '7.8', expected_ruby: '2.7.6' }, + { envvar: 'PDK_PUPPET_VERSION', version: '7.18.0', expected_puppet: '7.18', expected_ruby: '2.7.6' }, + { envvar: 'PDK_PUPPET_VERSION', version: '7.20.0', expected_puppet: '7.20', expected_ruby: '2.7.6' }, { envvar: 'PDK_PE_VERSION', version: '2018.1', expected_puppet: '5.5', expected_ruby: '2.4' }, { envvar: 'PDK_PE_VERSION', version: '2019.8.7', expected_puppet: '6.23', expected_ruby: '2.5.9' }, - { envvar: 'PDK_PE_VERSION', version: '2021.1', expected_puppet: '7.6', expected_ruby: '2.7.6' }, - { envvar: 'PDK_PE_VERSION', version: '2021.2', expected_puppet: '7.8', expected_ruby: '2.7.6' }, + { envvar: 'PDK_PE_VERSION', version: '2021.7.1', expected_puppet: '7.20', expected_ruby: '2.7.6' }, ] before(:all) do From c39a92417ebd09f896c40ff7b598d3b3e37d6442 Mon Sep 17 00:00:00 2001 From: Gavin Patton Date: Wed, 11 Jan 2023 15:17:21 +0000 Subject: [PATCH 4/4] (CONT-422) - Remove references to puppet 5 Prior to this commit, spec tests expected puppet 5 which was removed in a previous commit. This commit fixes that and a couple of other test errors. --- package-testing/spec/package/version_selection_spec.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package-testing/spec/package/version_selection_spec.rb b/package-testing/spec/package/version_selection_spec.rb index 29e5707b3..8fb5fdf1e 100644 --- a/package-testing/spec/package/version_selection_spec.rb +++ b/package-testing/spec/package/version_selection_spec.rb @@ -3,14 +3,13 @@ describe 'Test puppet & ruby version selection' do module_name = 'version_selection' test_cases = [ - { envvar: 'PDK_PUPPET_VERSION', version: '5.5.0', expected_puppet: '5.5', expected_ruby: '2.4' }, { envvar: 'PDK_PUPPET_VERSION', version: '6.21.0', expected_puppet: '6.21', expected_ruby: '2.5.9' }, { envvar: 'PDK_PUPPET_VERSION', version: '6.23.0', expected_puppet: '6.23', expected_ruby: '2.5.9' }, - { envvar: 'PDK_PUPPET_VERSION', version: '7.18.0', expected_puppet: '7.18', expected_ruby: '2.7.6' }, - { envvar: 'PDK_PUPPET_VERSION', version: '7.20.0', expected_puppet: '7.20', expected_ruby: '2.7.6' }, - { envvar: 'PDK_PE_VERSION', version: '2018.1', expected_puppet: '5.5', expected_ruby: '2.4' }, + { envvar: 'PDK_PUPPET_VERSION', version: '7.18.0', expected_puppet: '7.18', expected_ruby: '2.7.7' }, + { envvar: 'PDK_PUPPET_VERSION', version: '7.20.0', expected_puppet: '7.20', expected_ruby: '2.7.7' }, { envvar: 'PDK_PE_VERSION', version: '2019.8.7', expected_puppet: '6.23', expected_ruby: '2.5.9' }, - { envvar: 'PDK_PE_VERSION', version: '2021.7.1', expected_puppet: '7.20', expected_ruby: '2.7.6' }, + { envvar: 'PDK_PE_VERSION', version: '2021.7.0', expected_puppet: '7.20', expected_ruby: '2.7.7' }, + { envvar: 'PDK_PE_VERSION', version: '2021.7.1', expected_puppet: '7.20', expected_ruby: '2.7.7' }, ] before(:all) do