opendev
/
puppet-apps_site
Code Issues Proposed changes

Fix beaker on xenial 

Update the spec helper to install puppet 3 from the Ubuntu repos instead
of from puppetlabs.

Change-Id: I42d5adc2f489d3b6b17fd8ce027c954cd9b3a59c
This commit is contained in:
Colleen Murphy 2017-06-24 15:29:02 +02:00
parent b310bf97ac
commit 300023f403
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spec/spec_helper_acceptance.rb
View File

@ -2,7 +2,14 @@ require 'beaker-rspec'
hosts.each do |host|
install_puppet
# puppet 3 isn't available from apt.puppetlabs.com so install it from the Xenial repos
on host, "which apt-get && apt-get install puppet -y", { :acceptable_exit_codes => [0,1] }
# otherwise use the beaker helpers to install the yum.puppetlabs.com repo and puppet
r = on host, "which yum", { :acceptable_exit_codes => [0,1] }
if r.exit_code == 0
install_puppet
end
add_platform_foss_defaults(host, 'unix')
on host, "mkdir -p #{host['distmoduledir']}"
end