Skip to content

Commit 65ea3b5

Browse files
committed
(PA-7824) Use newest Bolt
This commit removes the pin for puppet_litmus in the Gemfile and adds both PuppetCore credentials and the PUPPET_FORGE_TOKEN env var in order to use puppet_litmus > 2, which uses newer (~> 5) versions of Bolt.
1 parent 8130f1a commit 65ea3b5

4 files changed

Lines changed: 9 additions & 14 deletions

File tree

.github/workflows/task_acceptance_tests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ jobs:
6262
with:
6363
ruby-version: ${{ env.ruby_version }}
6464
bundler-cache: true
65+
env:
66+
BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ secrets.PUPPET_FORGE_TOKEN_PUBLIC || '' }}
67+
PUPPET_FORGE_TOKEN: 'YES'
6568

6669
- name: Run task acceptance tests
6770
run: |

.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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ group :development, :release_prep do
7777
gem "puppet-blacksmith", '~> 7.0', require: false
7878
end
7979
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
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', 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
8585
end
8686

8787
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)