Bump default puppet version from 6 to 7
... because puppet 6 already reached its EOL. Change-Id: Ide378181561297b1263792cc1bbe5085e2910f9b
This commit is contained in:
parent
ac9dd70534
commit
ac91c1127f
|
@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
|
|||
spec.add_dependency 'rake'
|
||||
spec.add_dependency 'minitest'
|
||||
|
||||
puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 6.0']
|
||||
puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 7.0']
|
||||
spec.add_dependency 'puppet', puppetversion
|
||||
|
||||
rspec_puppet_version = ENV.key?('RSPEC_PUPPET_VERSION') ? ENV['RSPEC_PUPPET_VERSION'] : ['~> 2.10.0']
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
||||
source $SCRIPT_DIR/functions
|
||||
|
||||
export PUPPET_VERSION=${PUPPET_VERSION:-6}
|
||||
export PUPPET_VERSION=${PUPPET_VERSION:-7}
|
||||
PUPPET_MAJOR_VERSION=`echo $PUPPET_VERSION | cut -c 1`
|
||||
export PUPPET_GEM_VERSION="~> $PUPPET_MAJOR_VERSION"
|
||||
|
||||
|
|
Loading…
Reference in New Issue