openstack
/
puppet-neutron
Code Issues Proposed changes

Use beaker-puppet_install_helper to install puppet 

When running with BEAKER_provision=no, the following happens:

In Trusty: beaker is running dpkg with '--force' option so even
if Puppet is already installed, the return code will be 0.
In CentOS: beaker is running 'rpm -ivh' the second time and since
the package is already here, the return code will be 1.

Using the new puppet install helper will abort installing puppet
if BEAKER_provision is no, so tests will continue as normal.

Change-Id: I74117c30d2eae269ac3e1e578943fefbd42b55b1
Co-Authored-By: Colleen Murphy <colleen@gazlene.net>
This commit is contained in:
Emilien Macchi 2015-06-30 16:56:46 -04:00
parent 79e9114e69
commit b7d7799863
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -18,6 +18,7 @@ end
group :system_tests do
gem 'beaker-rspec', :require => 'false'
gem 'beaker-puppet_install_helper', :require => false
end
if facterversion = ENV['FACTER_GEM_VERSION']

8
spec/spec_helper_acceptance.rb
View File

@ -1,11 +1,7 @@
require 'beaker-rspec'
require 'beaker/puppet_install_helper'
hosts.each do |host|
install_puppet
on host, "mkdir -p #{host['distmoduledir']}"
end
run_puppet_install_helper
RSpec.configure do |c|
# Project root