Skip to content

Commit 373dcd6

Browse files
Puppetcore updates
1 parent 09a348d commit 373dcd6

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

.fixtures.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ fixtures:
66
"provision": "https://github.com/puppetlabs/provision.git"
77
puppet_agent:
88
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
9-
ref: v4.21.0
9+
ref: v4.25.0

Gemfile

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,30 @@ group :development do
2222
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))
2323
gem "deep_merge", '~> 1.2.2', require: false
2424
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25-
gem "facterdb", '~> 2.1', require: false
25+
gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
26+
gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2627
gem "metadata-json-lint", '~> 4.0', require: false
27-
gem "rspec-puppet-facts", '~> 4.0', require: false
28+
gem "json-schema", '< 5.1.1', require: false
29+
gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
30+
gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2831
gem "dependency_checker", '~> 1.0.0', require: false
2932
gem "parallel_tests", '= 3.12.1', require: false
3033
gem "pry", '~> 0.10', require: false
3134
gem "simplecov-console", '~> 0.9', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
35+
gem "puppet-debugger", '~> 1.6', require: false
3336
gem "rubocop", '~> 1.50.0', require: false
3437
gem "rubocop-performance", '= 1.16.0', require: false
3538
gem "rubocop-rspec", '= 2.19.0', require: false
3639
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "rexml", '>= 3.3.9', require: false
40+
gem "bigdecimal", '< 3.2.2', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3841
end
3942
group :development, :release_prep do
4043
gem "puppet-strings", '~> 4.0', require: false
41-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
44+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
4245
end
4346
group :system_tests do
44-
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
47+
gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
48+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
4549
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
4650
gem "serverspec", '~> 2.41', require: false
4751
end
@@ -52,12 +56,20 @@ hiera_version = ENV['HIERA_GEM_VERSION']
5256

5357
gems = {}
5458

55-
gems['puppet'] = location_for(puppet_version)
59+
puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
60+
facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
61+
hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
5662

57-
# If facter or hiera versions have been specified via the environment
58-
# variables
63+
# If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
64+
# Otherwise, do as before and use location_for to fetch gems from the default source
65+
if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
66+
gems['puppet'] = ['~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
67+
gems['facter'] = ['~> 4.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
68+
else
69+
gems['puppet'] = location_for(puppet_version)
70+
gems['facter'] = location_for(facter_version) if facter_version
71+
end
5972

60-
gems['facter'] = location_for(facter_version) if facter_version
6173
gems['hiera'] = location_for(hiera_version) if hiera_version
6274

6375
gems.each do |gem_name, gem_params|

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"requirements": [
2525
{
2626
"name": "puppet",
27-
"version_requirement": ">= 7.0.0 < 9.0.0"
27+
"version_requirement": ">= 8.0.0 < 9.0.0"
2828
}
2929
],
3030
"description": "MySQL module",

0 commit comments

Comments
 (0)