(PA-6178) Update to Beaker 5 / beaker-puppet 3

This commit updates .sync.yml and Gemfile to use Beaker 5.x, beaker-abs 1.x,
beaker-puppet 3.x and drops beaker-pe. Also, this commit adds a condition for
beaker-puppet to ensure beaker-puppet is only listed in the Gemfile if Ruby is
< 3.1.0. This is because beaker-puppet cannot run on Ruby > 3.1 or else Bundler
errors will occur.

diff --git a/.sync.yml b/.sync.yml
index 48a1c77066496744a853c85dbddaf5af42fa7dcc..1321017e35600a5b70d5781d44901c950348bdb5 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -3,19 +3,21 @@ Gemfile:
   optional:
     ":development":
       - gem: beaker
-        version: '~> 4.30'
+        version: '~> 5.0'
         from_env: BEAKER_VERSION
       - gem: beaker-abs
         from_env: BEAKER_ABS_VERSION
-        version: '~> 0.9'
-      - gem: beaker-pe
+        version: '~> 1.0'
       - 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: '~> 1.22'
+        version: '~> 3.0'
+        condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
       - gem: async
         version: '~> 1'
       - gem: beaker-module_install_helper

diff --git a/Gemfile b/Gemfile
index 773968869e39580f04d9b34d3d08f9ff2e7a672a..6a5f4e054dcca12581e37bc0a84c2f39def92f26 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -14,38 +14,37 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 group :development do
-  gem "json", '= 2.1.0',                                                        require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                                                        require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.5.1',                                                        require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.1',                                                        require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.3',                                                        require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "racc", '~> 1.4.0',                                                       require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "voxpupuli-puppet-lint-plugins", '~> 5.0',                                require: false
-  gem "facterdb", '~> 1.18',                                                    require: false
-  gem "metadata-json-lint", '~> 3.0',                                           require: false
-  gem "puppetlabs_spec_helper", '~> 6.0',                                       require: false
-  gem "rspec-puppet-facts", '~> 2.0',                                           require: false
-  gem "codecov", '~> 0.2',                                                      require: false
-  gem "dependency_checker", '~> 1.0.0',                                         require: false
-  gem "parallel_tests", '= 3.12.1',                                             require: false
-  gem "pry", '~> 0.10',                                                         require: false
-  gem "simplecov-console", '~> 0.5',                                            require: false
-  gem "puppet-debugger", '~> 1.0',                                              require: false
-  gem "rubocop", '= 1.48.1',                                                    require: false
-  gem "rubocop-performance", '= 1.16.0',                                        require: false
-  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'] || '~> 4.30')
-  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.9')
-  gem "beaker-pe",                                                              require: false
+  gem "json", '= 2.1.0',                                                       require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                                                       require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                                                       require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                                                       require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                                                       require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "racc", '~> 1.4.0',                                                      require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 5.0',                               require: false
+  gem "facterdb", '~> 1.18',                                                   require: false
+  gem "metadata-json-lint", '~> 3.0',                                          require: false
+  gem "puppetlabs_spec_helper", '~> 6.0',                                      require: false
+  gem "rspec-puppet-facts", '~> 2.0',                                          require: false
+  gem "codecov", '~> 0.2',                                                     require: false
+  gem "dependency_checker", '~> 1.0.0',                                        require: false
+  gem "parallel_tests", '= 3.12.1',                                            require: false
+  gem "pry", '~> 0.10',                                                        require: false
+  gem "simplecov-console", '~> 0.5',                                           require: false
+  gem "puppet-debugger", '~> 1.0',                                             require: false
+  gem "rubocop", '= 1.48.1',                                                   require: false
+  gem "rubocop-performance", '= 1.16.0',                                       require: false
+  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-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0')
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
-  gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.22')
-  gem "async", '~> 1',                                                          require: false
-  gem "beaker-module_install_helper",                                           require: false
-  gem "beaker-puppet_install_helper",                                           require: false
-  gem "nokogiri",                                                               require: false
+  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 "async", '~> 1',                                                         require: false
+  gem "beaker-module_install_helper",                                          require: false
+  gem "beaker-puppet_install_helper",                                          require: false
+  gem "nokogiri",                                                              require: false
 end
 group :system_tests do
   gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]