Skip to content

Commit 301d1f2

Browse files
authored
Merge pull request #967 from bastelfreak/update
Update voxpupuli-release/voxpupuli-test to use openvox gems
2 parents 57ff47b + 71fe654 commit 301d1f2

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

config_defaults.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
Jenkinsfile:
1313
delete: true
1414
Gemfile:
15-
puppet_version: ['>= 7.24', '< 9']
15+
openvox_version: ['>= 7', '< 9']
1616
required:
1717
':test':
1818
- gem: voxpupuli-test
19-
version: '~> 10.0'
19+
version: '~> 11.0'
2020
- gem: puppet_metadata
2121
version: '~> 5.0'
2222
':development':
@@ -28,7 +28,7 @@ Gemfile:
2828
version: '~> 3.5'
2929
':release':
3030
- gem: voxpupuli-release
31-
version: '~> 3.0'
31+
version: '~> 4.0'
3232
Rakefile:
3333
# config.user: USER
3434
# config.project: PROJECT

moduleroot/Gemfile.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ end
3333
3434
<% end -%>
3535
gem 'rake', :require => false
36-
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
3736
38-
puppetversion = ENV['PUPPET_GEM_VERSION'] || <%= @configs['puppet_version'].inspect %>
39-
gem 'puppet', puppetversion, :require => false, :groups => [:test]
37+
gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', <%= @configs['openvox_version'].inspect %>), :require => false, :groups => [:test]
4038
4139
# vim: syntax=ruby

0 commit comments

Comments
 (0)