summaryrefslogtreecommitdiff
path: root/spec/spec_helper_acceptance.rb
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2014-07-11 17:27:16 -0400
committerAshley Penney <ashley.penney@puppetlabs.com>2014-07-11 17:27:16 -0400
commit8eb3d7f62157f24a0f0f4caea07b71bf27c01b37 (patch)
tree7d05108ac91278b273defcad12256f51380d78a5 /spec/spec_helper_acceptance.rb
parent3779f9eddd9780821297dc7729a4e1df829df640 (diff)
parent6624f40651f44e184878a9fbb862bda886d899e8 (diff)
downloadpuppet-vcsrepo-8eb3d7f62157f24a0f0f4caea07b71bf27c01b37.tar.gz
puppet-vcsrepo-8eb3d7f62157f24a0f0f4caea07b71bf27c01b37.tar.bz2
Merge pull request #173 from hunner/mod_660
(MODULES-660) Correct detached HEAD on latest
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
-rw-r--r--spec/spec_helper_acceptance.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index e566a12..d37c169 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,6 +1,6 @@
require 'beaker-rspec'
-unless ENV['RS_PROVISION'] == 'no'
+unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
hosts.each do |host|
# Install Puppet
if host.is_pe?