Update Beaker to 6 and beaker-puppet to 4

Author: mhashizume

.sync.yml

@@ -13,21 +13,19 @@ Gemfile:
   optional:
     ":development":
       - gem: beaker
-        version: '~> 5.0'
+        version: '~> 6.0'
         from_env: BEAKER_VERSION
       - gem: beaker-abs
         from_env: BEAKER_ABS_VERSION
         version: '~> 1.0'
-      - gem: beaker-docker
-        version: '~> 0.3'
       - gem: beaker-hostgenerator
         from_env: BEAKER_HOSTGENERATOR_VERSION
       - gem: beaker-rspec
         from_env: BEAKER_RSPEC_VERSION
       # Prevent beaker-puppet from being installed on Ruby > 3.1 until beaker-puppet supports newer Rubies (PA-6136)
       - gem: beaker-puppet
         from_env: BEAKER_PUPPET_VERSION
-        version: '~> 3.0'
+        version: '~> 4.0'
         condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
       - gem: beaker-module_install_helper
       - gem: beaker-puppet_install_helper
@@ -42,7 +40,7 @@ Gemfile:
         version: '~> 1.30' # otherwise async 2.0.0(needs ruby >=3.1.0) is wrongly selected by bundler on jenkins while running with ruby 2.7.1
     ":system_tests":
       - gem: voxpupuli-acceptance
-        version: '~> 1.0'
+        version: '~> 3'
 
 appveyor.yml:
   delete: true

Gemfile

@@ -36,12 +36,11 @@ group :development do
   gem "rubocop-rspec", '= 2.19.0',                                             require: false
   gem "puppet-strings", '~> 4.0',                                              require: false
   gem "rb-readline", '= 0.5.5',                                                require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5.0')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 6.0')
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0')
-  gem "beaker-docker", '~> 0.3',                                               require: false
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
-  gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3.0') if Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4.0') if Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "beaker-module_install_helper",                                          require: false
   gem "beaker-puppet_install_helper",                                          require: false
   gem "nokogiri",                                                              require: false
@@ -50,9 +49,9 @@ group :development do
   gem "async", '~> 1.30',                                                      require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '~> 1.0',        require: false, platforms: [:ruby, :x64_mingw]
-  gem "serverspec", '~> 2.41',          require: false
-  gem "voxpupuli-acceptance", '~> 1.0', require: false
+  gem "puppet_litmus", '~> 1.0',      require: false, platforms: [:ruby, :x64_mingw]
+  gem "serverspec", '~> 2.41',        require: false
+  gem "voxpupuli-acceptance", '~> 3', require: false
 end
 group :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false

acceptance/Gemfile

@@ -18,8 +18,8 @@ end
 
 gem "rake", "~> 12.3"
 
-gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5')
-gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3')
+gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 6')
+gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4')
 
 gem "beaker-docker", *location_for(ENV['BEAKER_DOCKER_VERSION'] || '~> 0')
 gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || '~> 0')

metadata.json

@@ -75,7 +75,7 @@
       "version_requirement": ">= 5.0.0 < 9.0.0"
     }
   ],
-  "pdk-version": "3.0.1",
+  "pdk-version": "3.2.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#3.0.1",
   "template-ref": "tags/3.0.1-0-gd13288a"
 }