summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2017-06-11 19:52:02 +0200
committerColleen Murphy <colleen@gazlene.net>2017-06-11 19:52:02 +0200
commitd4f6905da6ab400fc57ab2d8be13610081a8cf94 (patch)
tree9c79fa81f62fb35eaf5fa51049d16d1642364bd8
parent9314b243807471383f121b85ffa00544ec8c27bd (diff)
Update beaker setup for xenial
Add a xenial nodeset and update the spec helper to install puppet 3 from the Ubuntu repos instead of from puppetlabs. Change-Id: I5d48236074dcb4e5d0fbd3466355d4224250e393
Notes
Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:11:09 +0000 Reviewed-on: https://review.openstack.org/473108 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--spec/acceptance/nodesets/nodepool-xenial.yml10
-rw-r--r--spec/spec_helper_acceptance.rb10
2 files changed, 19 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..de96291 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -2,7 +2,15 @@ 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')
13
6 14
7 on host, "mkdir -p #{host['distmoduledir']}" 15 on host, "mkdir -p #{host['distmoduledir']}"
8end 16end