summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb')
-rw-r--r--spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
index 151d801..9fea700 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_branch_checkout'
branch = 'a_branch'
hosts.each do |host|
+ ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
tmpdir = host.tmpdir('vcsrepo')
step 'setup - create repo' do
install_package(host, 'git')
@@ -21,12 +22,12 @@ hosts.each do |host|
server.start
EOF
create_remote_file(host, '/tmp/http_daemon.rb', http_daemon)
- on(host, "ruby /tmp/http_daemon.rb")
+ on(host, "#{ruby} /tmp/http_daemon.rb")
end
teardown do
on(host, "rm -fr #{tmpdir}")
- on(host, 'ps ax | grep "ruby /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+ on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
end
step 'checkout a branch with puppet' do