Merge pull request #1195 from puppetlabs/CONT-422-release_2.6.0

(CONT-422) PDK v2.6.0
puppetlabs · Jan 16, 2023 · ddf4151 · ddf4151
2 parents 15583ca + c39a924
commit ddf4151
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git 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
diff --git 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'

diff --git a/package-testing/spec/package/version_selection_spec.rb b/package-testing/spec/package/version_selection_spec.rb
@@ -3,15 +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.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_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.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.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