opendev
/
puppet-openstack_infra_spec_helper
Code Issues Proposed changes

Cap rake below 12.3.0 

New rake version 12.3.0 needs ruby 2.0 or greater which is not available
on our trusty test nodes. Cap to under rake 12.3.0 so that we use older
rake until we can stop using trusty and have more modern ruby.

The test runner script updates the installation path for this helper lib
to point back at itself when running local tests. Unfortunately it was
doing so with a buggy sed that no longer matched the contents of the
Gemfile that needed updating.

Fix this by updating the sed command to properly point to this lib for
local testing. Note this is fixed here because we need both fixes in
together in order to get gate jobs to pass.

Change-Id: Iddbbab9ea5996df4922bf7927deb8f0354378ab7
This commit is contained in:
Clark Boylan 2017-11-18 15:08:23 -08:00
parent b5924b5de0
commit a9b567eadf
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet-openstack_infra_spec_helper.gemspec
View File

@ -16,6 +16,10 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]
# This is a transitive dep that we define early so that the version
# that works for us is found.
# rake 12.3.0 requires Ruby version ~> 2.0
spec.add_dependency 'rake', ['< 12.3.0']
# dependencies that are needed to run puppet-lint
spec.add_dependency 'puppet', [ '~> 3.8']
spec.add_dependency 'puppetlabs_spec_helper'

5
run_unit_tests.sh
View File

@ -32,7 +32,10 @@ cd openstack-infra/puppet-openstackci
# 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-infra\/puppet-openstack_infra_spec_helper.*/ :path => '..\/..',/" Gemfile
# Note this is largely belts and suspenders for local test runs.
# puppet-openstackci already attempts to determine if it is running
# under Zuul and will do the correct thing in that case.
sed -i "s/:git => 'https:\/\/git.openstack.org\/openstack-infra\/puppet-openstack_infra_spec_helper'}/:path => '..\/..'}/" Gemfile
# Install dependencies
gem install bundler --no-rdoc --no-ri --verbose