Skip to content

Commit 7246266

Browse files
committed
(PA-7824) Use newest Bolt
This commit updates the Gemfile to always use the latest major version of puppet_litmus, even when the PUPPET_FORGE_TOKEN env var is not present, so that we can always use the latest Bolt. We do not want to control whether we use the latest bolt with that env var because we want to be able to use unreleased Puppet 9 nightly gems from an internal Artifactory instance instead of from public Puppet Core repos (from which Puppet 9 nightlies are currently unavailable).
1 parent 8130f1a commit 7246266

3 files changed

Lines changed: 7 additions & 14 deletions

File tree

.sync.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ Gemfile:
3737
":system_tests":
3838
- gem: voxpupuli-acceptance
3939
version: '~> 3'
40-
- gem: puppet_litmus
41-
version:
42-
- '~> 1.0'
43-
- '!= 1.6.1'
44-
condition: 'ENV["PUPPET_FORGE_TOKEN"].to_s.empty?'
45-
platforms:
46-
- ruby
47-
- x64_mingw
4840

4941
.github/workflows/release.yml:
5042
unmanaged: false

Gemfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,13 @@ group :development, :release_prep do
7676
gem "puppetlabs_spec_helper", '~> 8.0', require: false
7777
gem "puppet-blacksmith", '~> 7.0', require: false
7878
end
79+
# We are overriding the default PDK template's Litmus logic in order to use the
80+
# latest Bolt in tests. See PA-7824.
7981
group :system_tests do
80-
gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
81-
gem "puppet_litmus", '~> 1.0', '!= 1.6.1', require: false, platforms: [:ruby, :x64_mingw] if ENV["PUPPET_FORGE_TOKEN"].to_s.empty?
82-
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
83-
gem "serverspec", '~> 2.41', require: false
84-
gem "voxpupuli-acceptance", '~> 3', require: false
82+
gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw]
83+
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
84+
gem "serverspec", '~> 2.41', require: false
85+
gem "voxpupuli-acceptance", '~> 3', require: false
8586
end
8687

8788
gems = {}

task_spec/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PuppetLint.configuration.send('disable_only_variable_string')
1212
PuppetLint.configuration.ignore_paths = ['spec/**/*.pp', 'pkg/**/*.pp']
1313

1414
task 'task_acceptance' do
15-
ENV['BEAKER_BOLT_VERSION'] = '3.0.0'
15+
ENV['BEAKER_BOLT_VERSION'] = '5.0.0'
1616
Rake::Task['spec_prep'].invoke
1717
Rake::Task['beaker'].invoke
1818
end

0 commit comments

Comments
 (0)