From 97e64b52f63f3dd673dfa2fe92c71d4d9ddbcbc7 Mon Sep 17 00:00:00 2001
From: John Duarte <john.duarte@puppetlabs.com>
Date: Thu, 15 May 2014 11:43:29 -0700
Subject: Add conditional ruby path based on pe

---
 spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb    | 5 +++--
 spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb   | 5 +++--
 spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb   | 5 +++--
 spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb  | 5 +++--
 spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb     | 5 +++--
 spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb    | 5 +++--
 .../beaker/git/revision_checkout/revision_checkout_http.rb           | 5 +++--
 .../beaker/git/revision_checkout/revision_checkout_https.rb          | 5 +++--
 .../beaker/git/shallow_clone/negative/shallow_clone_http.rb          | 5 +++--
 spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb      | 5 +++--
 spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb         | 5 +++--
 spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb        | 5 +++--
 spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb       | 5 +++--
 spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb      | 5 +++--
 14 files changed, 42 insertions(+), 28 deletions(-)

(limited to 'spec/acceptance')

diff --git a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
index d43ae0a..f2486cd 100644
--- a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
+++ b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
@@ -7,6 +7,7 @@ password  = 'bar'
 http_server_script = 'basic_auth_http_daemon.rb'
 
 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')
@@ -34,12 +35,12 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, "#{tmpdir}/#{http_server_script}", script)
-    on(host, "ruby #{tmpdir}/#{http_server_script}")
+    on(host, "#{ruby} #{tmpdir}/#{http_server_script} &")
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep 'ruby #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'checkout with puppet using basic auth' do
diff --git a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
index f033d22..67a6f73 100644
--- a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
+++ b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
@@ -7,6 +7,7 @@ password  = 'bar'
 http_server_script = 'basic_auth_https_daemon.rb'
 
 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')
@@ -39,12 +40,12 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, "#{tmpdir}/#{http_server_script}", script)
-    on(host, "ruby #{tmpdir}/#{http_server_script}")
+    on(host, "#{ruby} #{tmpdir}/#{http_server_script}")
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, "ps ax | grep 'ruby #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+    on(host, "ps ax | grep '#{ruby} #{tmpdir}/#{http_server_script}' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'checkout with puppet using basic auth' do
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
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
index 273f5aa..4d6a4ab 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.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')
@@ -28,12 +29,12 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, '/tmp/https_daemon.rb', https_daemon)
-    #on(host, "ruby /tmp/https_daemon.rb")
+    #on(host, "#{ruby} /tmp/https_daemon.rb")
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "ruby /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
   end
 
   step 'checkout a branch with puppet' do
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
index 5c05baa..4888bd2 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_group_checkout'
 group = 'mygroup'
 
 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,7 +22,7 @@ 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
 
   step 'setup - create group' do
@@ -30,7 +31,7 @@ hosts.each do |host|
 
   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')
     apply_manifest_on(host, "group { '#{group}': ensure => absent, }")
   end
 
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
index 4551aee..3a72cc8 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_group_checkout'
 group = 'mygroup'
 
 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')
@@ -28,7 +29,7 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, '/tmp/https_daemon.rb', https_daemon)
-    #on(host, "ruby /tmp/https_daemon.rb")
+    #on(host, "#{ruby} /tmp/https_daemon.rb")
   end
 
   step 'setup - create group' do
@@ -37,7 +38,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "ruby /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
     apply_manifest_on(host, "group { '#{group}': ensure => absent, }")
   end
 
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
index 40db6c9..5f5d9e5 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
@@ -4,6 +4,7 @@ test_name 'C3455 - checkout a revision (http protocol)'
 repo_name = 'testrepo_revision_checkout'
 
 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')
@@ -20,12 +21,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 'get revision sha from repo' do
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
index dc3dc7f..0a935aa 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
@@ -4,6 +4,7 @@ test_name 'C3456 - checkout a revision (https protocol)'
 repo_name = 'testrepo_revision_checkout'
 
 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')
@@ -27,12 +28,12 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, '/tmp/https_daemon.rb', https_daemon)
-    #on(host, "ruby /tmp/https_daemon.rb")
+    #on(host, "#{ruby} /tmp/https_daemon.rb")
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "ruby /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
   end
 
   step 'get revision sha from repo' do
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
index a67ec00..4c43be1 100644
--- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
@@ -4,6 +4,7 @@ test_name 'C3479 - shallow clone repo minimal depth = 1 (http protocol)'
 repo_name = 'testrepo_shallow_clone'
 
 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')
@@ -20,12 +21,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 'shallow clone repo with puppet' do
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
index e016e55..1a34521 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
@@ -4,6 +4,7 @@ test_name 'C3480 - shallow clone repo minimal depth = 1 (https protocol)'
 repo_name = 'testrepo_shallow_clone'
 
 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')
@@ -27,12 +28,12 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, '/tmp/https_daemon.rb', https_daemon)
-    #on(host, "ruby /tmp/https_daemon.rb")
+    #on(host, "#{ruby} /tmp/https_daemon.rb")
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "ruby /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
   end
 
   step 'shallow clone repo with puppet' do
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
index 3a6d33f..f2f721a 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_tag_checkout'
 tag = '0.0.2'
 
 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 'get tag sha from repo' do
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
index b277d6d..fdfa02c 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_tag_checkout'
 tag = '0.0.2'
 
 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')
@@ -28,12 +29,12 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, '/tmp/https_daemon.rb', https_daemon)
-    #on(host, "ruby /tmp/https_daemon.rb")
+    #on(host, "#{ruby} /tmp/https_daemon.rb")
   end
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "ruby /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
   end
 
   step 'get tag sha from repo' do
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
index 6faad95..379425b 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_user_checkout'
 user = 'myuser'
 
 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,7 +22,7 @@ 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
 
   step 'setup - create user' do
@@ -30,7 +31,7 @@ hosts.each do |host|
 
   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')
     apply_manifest_on(host, "user { '#{user}': ensure => absent, }")
   end
 
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
index 28a17b8..bd9b498 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
@@ -5,6 +5,7 @@ repo_name = 'testrepo_user_checkout'
 user = 'myuser'
 
 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')
@@ -28,7 +29,7 @@ hosts.each do |host|
     server.start
     EOF
     create_remote_file(host, '/tmp/https_daemon.rb', https_daemon)
-    #on(host, "ruby /tmp/https_daemon.rb")
+    #on(host, "#{ruby} /tmp/https_daemon.rb")
   end
 
   step 'setup - create user' do
@@ -37,7 +38,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "ruby /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
     apply_manifest_on(host, "user { '#{user}': ensure => absent, }")
   end
 
-- 
cgit v1.2.3