Accomodate ubuntu-10 package for git in beaker tests

Add conditional to install `git-core` if the platform under test
is ubuntu-10. The `git` package is not available for this platform.

12 files changed, 60 insertions, 12 deletions

diff --git a/spec/acceptance/beaker/git/compression/compression_0_checkout.rb b/spec/acceptance/beaker/git/compression/compression_0_checkout.rb
index f17d497..7ac4c4a 100644
--- a/spec/acceptance/beaker/git/compression/compression_0_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_0_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_1_checkout.rb b/spec/acceptance/beaker/git/compression/compression_1_checkout.rb
index ee910fd..8b7455d 100644
--- a/spec/acceptance/beaker/git/compression/compression_1_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_1_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_2_checkout.rb b/spec/acceptance/beaker/git/compression/compression_2_checkout.rb
index aeec31a..81d32c3 100644
--- a/spec/acceptance/beaker/git/compression/compression_2_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_2_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_3_checkout.rb b/spec/acceptance/beaker/git/compression/compression_3_checkout.rb
index fe1ee0a..12b60a3 100644
--- a/spec/acceptance/beaker/git/compression/compression_3_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_3_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_4_checkout.rb b/spec/acceptance/beaker/git/compression/compression_4_checkout.rb
index 071cc5e..66d2d5e 100644
--- a/spec/acceptance/beaker/git/compression/compression_4_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_4_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_5_checkout.rb b/spec/acceptance/beaker/git/compression/compression_5_checkout.rb
index 1ea0737..b60a9f7 100644
--- a/spec/acceptance/beaker/git/compression/compression_5_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_5_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
index a8376d7..2f6b075 100644
--- a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb
index c5f49e6..e74cca9 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb
index 74fd112..59aaf21 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb
index ba56621..b989e58 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb
index abab7f1..e1373af 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb
index 2485424..1253db1 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")