Pin puppet to 4.10.3
Puppet 4.10.4 errors when running the syntax jobs under ruby 2.0.0 so we
need to pin to 4.10.3 for the stable branches.
Change-Id: If663c5982029178f9a33580cf7ff71d9287e2a21
(cherry picked from commit 395a09632f)
This commit is contained in:
@@ -19,6 +19,9 @@ install_gems() {
|
||||
# Modify Gemfile to use local library and not the one on git
|
||||
# so we can actually test the current state of the gem.
|
||||
sed -i "s/.*git => 'https:\/\/git.openstack.org\/openstack\/puppet-openstack_spec_helper.*/ :path => '..\/..',/" Gemfile
|
||||
# NOTE(aschultz): in order for this to work we need to nuke the branch line
|
||||
# since we're replacing the repository with a path
|
||||
sed -i "/.*branch[[:space:]]*=> 'stable\/.*/d" Gemfile
|
||||
|
||||
# Install dependencies
|
||||
gem install bundler --no-rdoc --no-ri --verbose
|
||||
|
||||
@@ -39,6 +39,10 @@ Gem::Specification.new do |spec|
|
||||
# fog-core 1.44.0 requires xmlrpc 0.3.0 which requires ruby 2.3.0 which is not available on centos7
|
||||
spec.add_dependency 'fog-core', ['< 1.44.0']
|
||||
|
||||
# puppet 4.10.4 added in a failure when using ruby 2.0.0, so we need to cap
|
||||
# puppet at 4.10.3 to fix CI
|
||||
spec.add_dependency 'puppet', ['< 4.10.4']
|
||||
|
||||
# Beaker 3.0.0 fails to run in Puppet Openstack CI
|
||||
# LoadError: cannot load such file -- serverspec
|
||||
# While we're investigating it, let's pin Beaker to 2.x releases.
|
||||
|
||||
Reference in New Issue
Block a user