openstack
/
puppet-openstack_spec_helper
Code Issues Proposed changes

Merge "Bump default puppet version from 6 to 7"

This commit is contained in:
Zuul 2023-05-22 14:56:40 +00:00 committed by Gerrit Code Review
parent 00f315dc2d ac91c1127f
commit 33031bfa8a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-openstack_spec_helper.gemspec
View File

@ -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
if ENV.key?('RSPEC_PUPPET_VERSION')

2
run_syntax_tests.sh
View File

@ -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"