summaryrefslogtreecommitdiff
path: root/spec/spec_helper_acceptance.rb
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-06-18 13:54:51 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-07-11 14:18:29 -0700
commit6624f40651f44e184878a9fbb862bda886d899e8 (patch)
tree11b4489c96fba7043e56058ec9baf020b2d79c93 /spec/spec_helper_acceptance.rb
parent4592bfd59cd5d4795069798a14b483e16c98c1ff (diff)
(MODULES-660) Correct detached HEAD on latest
Previously vcsrepo detached HEAD on checkout which caused further branch revisions to fail. This corrects the behavior, and works on git 1.7, 1.8, 1.9, and 2.0
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?