summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2015-07-09 17:11:10 -0700
committerMorgan Haskel <morgan@puppetlabs.com>2015-07-09 17:11:10 -0700
commit224b644003f99d83e53654af74f4002133545d55 (patch)
tree85fa19d88f0d173cb05af4dd0dc0436c2f1049f7 /spec
parenta2026bf13bad920393e4792a40f08721ef1c0e67 (diff)
Use puppet_install_helper
Diffstat (limited to 'spec')
-rwxr-xr-xspec/spec_helper_acceptance.rb22
1 files changed, 2 insertions, 20 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 39d2d52..7b09a38 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,28 +1,10 @@
#! /usr/bin/env ruby -S rspec
require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
UNSUPPORTED_PLATFORMS = []
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
- foss_opts = {
- :default_action => 'gem_install',
- :version => (ENV['PUPPET_VERSION'] || '3.8.1'),
- }
-
- if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
-
- hosts.each do |host|
- if host['platform'] !~ /windows/i
- if host.is_pe?
- on host, 'mkdir -p /etc/puppetlabs/facter/facts.d'
- else
- on host, "/bin/touch #{host['puppetpath']}/hiera.yaml"
- on host, "mkdir -p #{host['distmoduledir']}"
- on host, 'mkdir -p /etc/facter/facts.d'
- end
- end
- end
-end
+run_puppet_install_helper
RSpec.configure do |c|
# Project root