Fix beaker on xenial
This patch adds a xenial nodeset and updates the spec helper to install puppet 3 from the Ubuntu repos instead of from puppetlabs. However, it ultimately disables the tests on xenial because neither the Ubuntu Cloud Archive[1] nor the Puppet-OpenStack modules support mitaka on xenial. We will need to plan our xenial upgrade and OpenStack upgrade at the same time and reenable xenial testing when we are ready for the OpenStack upgrade. [1] http://ubuntu-cloud.archive.canonical.com/ubuntu/dists/xenial-updates/ Change-Id: I3b7c2c83d6a20907de4b69fe6fcd4c59a5052d23
This commit is contained in:
parent
8c73949ded
commit
ebcf33c92a
@ -1,6 +1,6 @@
|
||||
require 'spec_helper_acceptance'
|
||||
|
||||
describe 'allinone', :if => os[:family] == 'ubuntu' do
|
||||
describe 'allinone', :if => os[:family] == 'ubuntu' && os[:release] != '16.04' do
|
||||
|
||||
fixtures_path = File.join(File.dirname(__FILE__), 'fixtures')
|
||||
controller_path = File.join(fixtures_path, 'allinone_controller.pp')
|
||||
|
10
spec/acceptance/nodesets/nodepool-xenial.yml
Normal file
10
spec/acceptance/nodesets/nodepool-xenial.yml
Normal file
@ -0,0 +1,10 @@
|
||||
HOSTS:
|
||||
ubuntu-16.04-amd64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-16.04-amd64
|
||||
hypervisor: none
|
||||
ip: 127.0.0.1
|
||||
CONFIG:
|
||||
type: foss
|
||||
set_env: false
|
@ -2,7 +2,15 @@ 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
|
||||
|
Loading…
x
Reference in New Issue
Block a user