Change minimum Puppet version to 6
Change-Id: Ic84d587a01f7ca58c3a18bce26a1fe7e131a11a0
This commit is contained in:
parent
e333ac0476
commit
c16f628d97
|
@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
|
|||
minitest_version = RUBY_VERSION < '2.3.0' ? ['< 5.12.1'] : ['>= 5.12.1']
|
||||
spec.add_dependency 'minitest', minitest_version
|
||||
|
||||
puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 5.5']
|
||||
puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? ENV['PUPPET_GEM_VERSION'] : ['>= 6.0']
|
||||
spec.add_dependency 'puppet', puppetversion
|
||||
|
||||
# TODO(tobias-urdin): We need to bump this to 2.7.1 soon which will cause strict checking
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
||||
source $SCRIPT_DIR/functions
|
||||
|
||||
export PUPPET_VERSION=${PUPPET_VERSION:-4}
|
||||
export PUPPET_VERSION=${PUPPET_VERSION:-6}
|
||||
PUPPET_MAJOR_VERSION=`echo $PUPPET_VERSION | cut -c 1`
|
||||
export PUPPET_GEM_VERSION="~> $PUPPET_MAJOR_VERSION"
|
||||
|
||||
|
|
Loading…
Reference in New Issue