summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2017-06-24 15:50:23 +0200
committerColleen Murphy <colleen@gazlene.net>2017-06-24 15:50:23 +0200
commit7b6d9468c1eaf0b6481b6a09b2185686148f0484 (patch)
tree5dbd93d46118ee84d6dfc584e15978a6d92e1d4d
parent9ece2bf61d32703cd0777a0781c44a87b21f5235 (diff)
Fix beaker on xenial
Add a xenial nodeset and update the spec helper to install puppet 3 from the Ubuntu repos instead of from puppetlabs. Change-Id: I19ec4ea48b440d0014395ebf81c04c8232649a65
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 27 Jun 2017 20:11:59 +0000 Reviewed-on: https://review.openstack.org/477120 Project: openstack-infra/puppet-kibana Branch: refs/heads/master
-rw-r--r--spec/acceptance/nodesets/nodepool-xenial.yml10
-rw-r--r--spec/spec_helper_acceptance.rb9
2 files changed, 18 insertions, 1 deletions
diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml
new file mode 100644
index 0000000..99dd318
--- /dev/null
+++ b/spec/acceptance/nodesets/nodepool-xenial.yml
@@ -0,0 +1,10 @@
1HOSTS:
2 ubuntu-16.04-amd64:
3 roles:
4 - master
5 platform: ubuntu-16.04-amd64
6 hypervisor: none
7 ip: 127.0.0.1
8CONFIG:
9 type: foss
10 set_env: false
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 7a5efa1..002ab34 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -2,7 +2,14 @@ require 'beaker-rspec'
2 2
3hosts.each do |host| 3hosts.each do |host|
4 4
5 install_puppet 5 # puppet 3 isn't available from apt.puppetlabs.com so install it from the Xenial repos
6 on host, "which apt-get && apt-get install puppet -y", { :acceptable_exit_codes => [0,1] }
7 # otherwise use the beaker helpers to install the yum.puppetlabs.com repo and puppet
8 r = on host, "which yum", { :acceptable_exit_codes => [0,1] }
9 if r.exit_code == 0
10 install_puppet
11 end
12 add_platform_foss_defaults(host, 'unix')
6 13
7 on host, "mkdir -p #{host['distmoduledir']}" 14 on host, "mkdir -p #{host['distmoduledir']}"
8end 15end