Skip to content

Commit 83014e4

Browse files
AriaXLiAriaXLi
committed
(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.
1 parent b3a8f7a commit 83014e4

File tree

2 files changed

+35
-34
lines changed

2 files changed

+35
-34
lines changed

‎.sync.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ Gemfile:
33
optional:
44
":development":
55
- gem: beaker
6-
version: '~> 4.30'
6+
version: '~> 5.0'
77
from_env: BEAKER_VERSION
88
- gem: beaker-abs
99
from_env: BEAKER_ABS_VERSION
10-
version: '~> 0.9'
11-
- gem: beaker-pe
10+
version: '~> 1.0'
1211
- gem: beaker-hostgenerator
1312
from_env: BEAKER_HOSTGENERATOR_VERSION
1413
- gem: beaker-rspec
1514
from_env: BEAKER_RSPEC_VERSION
15+
# Prevent beaker-puppet from being installed on Ruby > 3.1 until
16+
# beaker-puppet supports newer Rubies (PA-6136)
1617
- gem: beaker-puppet
1718
from_env: BEAKER_PUPPET_VERSION
18-
version: '~> 1.22'
19+
version: '~> 3.0'
20+
condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
1921
- gem: async
2022
version: '~> 1'
2123
- gem: beaker-module_install_helper

‎Gemfile‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,37 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
group :development do
17-
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))
18-
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))
19-
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))
20-
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))
21-
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))
22-
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))
23-
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
24-
gem "facterdb", '~> 1.18', require: false
25-
gem "metadata-json-lint", '~> 3.0', require: false
26-
gem "puppetlabs_spec_helper", '~> 6.0', require: false
27-
gem "rspec-puppet-facts", '~> 2.0', require: false
28-
gem "codecov", '~> 0.2', require: false
29-
gem "dependency_checker", '~> 1.0.0', require: false
30-
gem "parallel_tests", '= 3.12.1', require: false
31-
gem "pry", '~> 0.10', require: false
32-
gem "simplecov-console", '~> 0.5', require: false
33-
gem "puppet-debugger", '~> 1.0', require: false
34-
gem "rubocop", '= 1.48.1', require: false
35-
gem "rubocop-performance", '= 1.16.0', require: false
36-
gem "rubocop-rspec", '= 2.19.0', require: false
37-
gem "puppet-strings", '~> 4.0', require: false
38-
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
39-
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.30')
40-
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.9')
41-
gem "beaker-pe", require: false
17+
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))
18+
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))
19+
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))
20+
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))
21+
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))
22+
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))
23+
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
24+
gem "facterdb", '~> 1.18', require: false
25+
gem "metadata-json-lint", '~> 3.0', require: false
26+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
27+
gem "rspec-puppet-facts", '~> 2.0', require: false
28+
gem "codecov", '~> 0.2', require: false
29+
gem "dependency_checker", '~> 1.0.0', require: false
30+
gem "parallel_tests", '= 3.12.1', require: false
31+
gem "pry", '~> 0.10', require: false
32+
gem "simplecov-console", '~> 0.5', require: false
33+
gem "puppet-debugger", '~> 1.0', require: false
34+
gem "rubocop", '= 1.48.1', require: false
35+
gem "rubocop-performance", '= 1.16.0', require: false
36+
gem "rubocop-rspec", '= 2.19.0', require: false
37+
gem "puppet-strings", '~> 4.0', require: false
38+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
39+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5.0')
40+
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0')
4241
gem "beaker-hostgenerator"
4342
gem "beaker-rspec"
44-
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.22')
45-
gem "async", '~> 1', require: false
46-
gem "beaker-module_install_helper", require: false
47-
gem "beaker-puppet_install_helper", require: false
48-
gem "nokogiri", require: false
43+
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))
44+
gem "async", '~> 1', require: false
45+
gem "beaker-module_install_helper", require: false
46+
gem "beaker-puppet_install_helper", require: false
47+
gem "nokogiri", require: false
4948
end
5049
group :system_tests do
5150
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]

0 commit comments

Comments
 (0)