Merge remote-tracking branch 'laurenrother/readme' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:00:06 +0000 (09:00 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:00:06 +0000 (09:00 -0700)
88 files changed:
.gitignore
CHANGELOG
Gemfile
Modulefile
metadata.json [new file with mode: 0644]
spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb
spec/acceptance/beaker/git/branch_checkout/branch_checkout_file.rb
spec/acceptance/beaker/git/branch_checkout/branch_checkout_file_path.rb
spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb
spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb
spec/acceptance/beaker/git/branch_checkout/branch_checkout_ssh.rb
spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb
spec/acceptance/beaker/git/clone/clone_file.rb
spec/acceptance/beaker/git/clone/clone_file_path.rb
spec/acceptance/beaker/git/clone/clone_git.rb
spec/acceptance/beaker/git/clone/clone_http.rb
spec/acceptance/beaker/git/clone/clone_https.rb
spec/acceptance/beaker/git/clone/clone_over_different_exiting_repo_with_force.rb
spec/acceptance/beaker/git/clone/clone_repo_with_excludes_in_repo.rb
spec/acceptance/beaker/git/clone/clone_repo_with_excludes_not_in_repo.rb
spec/acceptance/beaker/git/clone/clone_scp.rb
spec/acceptance/beaker/git/clone/clone_ssh.rb
spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb
spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb
spec/acceptance/beaker/git/compression/compression_0_checkout.rb
spec/acceptance/beaker/git/compression/compression_1_checkout.rb
spec/acceptance/beaker/git/compression/compression_2_checkout.rb
spec/acceptance/beaker/git/compression/compression_3_checkout.rb
spec/acceptance/beaker/git/compression/compression_4_checkout.rb
spec/acceptance/beaker/git/compression/compression_5_checkout.rb
spec/acceptance/beaker/git/compression/compression_6_checkout.rb
spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb
spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb
spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb
spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb
spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb
spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb
spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb
spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb
spec/acceptance/beaker/git/group_checkout/group_checkout_file.rb
spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb
spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
spec/acceptance/beaker/git/group_checkout/group_checkout_scp.rb
spec/acceptance/beaker/git/group_checkout/group_checkout_ssh.rb
spec/acceptance/beaker/git/group_checkout/negative/group_checkout_file_non_existent_group.rb
spec/acceptance/beaker/git/revision_checkout/negative/revision_checkout_not_exists.rb
spec/acceptance/beaker/git/revision_checkout/revision_checkout_file.rb
spec/acceptance/beaker/git/revision_checkout/revision_checkout_file_path.rb
spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb
spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_exec_depth.rb
spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb
spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_negative_depth.rb
spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_overflow_depth.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_file.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_scp.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_ssh.rb
spec/acceptance/beaker/git/shallow_clone/shallow_clone_zero_depth.rb
spec/acceptance/beaker/git/tag_checkout/negative/tag_checkout_not_exists.rb
spec/acceptance/beaker/git/tag_checkout/tag_checkout_file.rb
spec/acceptance/beaker/git/tag_checkout/tag_checkout_file_path.rb
spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb
spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
spec/acceptance/beaker/git/tag_checkout/tag_checkout_scp.rb
spec/acceptance/beaker/git/tag_checkout/tag_checkout_ssh.rb
spec/acceptance/beaker/git/user_checkout/negative/user_checkout_file_non_existent_user.rb
spec/acceptance/beaker/git/user_checkout/user_checkout_file.rb
spec/acceptance/beaker/git/user_checkout/user_checkout_file_path.rb
spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
spec/acceptance/beaker/git/user_checkout/user_checkout_scp.rb
spec/acceptance/beaker/git/user_checkout/user_checkout_ssh.rb
spec/acceptance/beaker_helper.rb
spec/spec_helper_acceptance.rb

index 44e004c..b5fe773 100644 (file)
@@ -4,6 +4,7 @@ coverage
 \#*
 Gemfile.lock
 log
+.vagrant
 
 #Intellij
 .idea
index 8142f5d..812a2c7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,29 @@
+2014-06-04 - Version 1.0.0
+
+Summary:
+
+This release focuses on a number of bugfixes, and also has some
+new features for Bzr and Git.
+
+Features:
+- Bzr:
+ - Call set_ownership
+- Git:
+ - Add ability for shallow clones
+ - Use -a and desired for HARD resets
+ - Use rev-parse to get tag canonical revision
+
+Fixes:
+- HG:
+ - Only add ssh options when it's talking to the network
+- Git:
+ - Fix for issue with detached HEAD
+ - force => true will now destroy and recreate repo
+ - Actually use the remote parameter
+ - Use origin/master instead of origin/HEAD when on master
+- SVN:
+ - Fix svnlook behavior with plain directories
+
 2013-11-13 - Version 0.2.0
 
 Summary:
diff --git a/Gemfile b/Gemfile
index 2fcc822..0120ece 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -7,8 +7,8 @@ group :development, :test do
   gem 'serverspec',              :require => false
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
+  gem 'beaker-rspec', '~>2.2',   :require => false
+  gem 'rspec', '~>2.14',         :require => false
   gem 'simplecov',               :require => false
 end
 
index d2bbe92..8a468ab 100644 (file)
@@ -1,4 +1,4 @@
-name 'puppetlabs/vcsrepo'
-version '0.2.0'
+name 'puppetlabs-vcsrepo'
+version '1.0.0'
 summary 'Manage repositories from various version control systems'
 description 'Manage repositories from various version control systems'
diff --git a/metadata.json b/metadata.json
new file mode 100644 (file)
index 0000000..29fb041
--- /dev/null
@@ -0,0 +1,63 @@
+{
+    "name": "puppetlabs-vcsrepo",
+    "version": "1.0.0",
+    "source": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
+    "author": "Puppet Labs",
+    "license": "GPLv2",
+    "project_page": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
+    "summary": "Puppet module providing a type to manage repositories from various version control systems",
+    "operatingsystem_support": [
+      {
+        "operatingsystem": "RedHat",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "CentOS",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "OracleLinux",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "Scientific",
+        "operatingsystemrelease": [
+          "5",
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "Debian",
+        "operatingsystemrelease": [
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "Ubuntu",
+        "operatingsystemrelease": [
+          "10.04",
+          "12.04",
+          "14.04"
+        ]
+      }
+    ],
+    "requirements": [
+      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
+      { "name": "puppet", "version_requirement": "3.x" }
+    ],
+    "dependencies": []
+}
index 18c7534..421c5f0 100644 (file)
@@ -12,7 +12,11 @@ hosts.each do |host|
   gem = '/opt/puppet/bin/gem' if host.is_pe? || 'gem'
   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")
index ac1359e..753e50c 100644 (file)
@@ -11,7 +11,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index 67544bf..3b47c48 100644 (file)
@@ -9,14 +9,18 @@ http_server_script = 'basic_auth_http_daemon.rb'
 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")
   end
 
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
index 1fbdd1a..3d2131c 100644 (file)
@@ -7,7 +7,11 @@ branch = 'a_branch'
 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")
index efbedc7..49b034e 100644 (file)
@@ -7,7 +7,11 @@ branch = 'a_branch'
 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")
index 8afa813..9557de8 100644 (file)
@@ -7,13 +7,17 @@ branch = 'a_branch'
 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")
   end
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
index a8d622d..fec60e2 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index f6baf19..3474c73 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index e55f805..493b3f4 100644 (file)
@@ -7,7 +7,11 @@ branch = 'a_branch'
 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")
index 6063bb9..5195ab8 100644 (file)
@@ -7,7 +7,11 @@ branch = 'a_branch'
 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")
index e44ea7e..7b9e64d 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_branch_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")
index a9ca366..45413a9 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 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")
index 616030c..a57e05a 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 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")
index 8a810af..3bceb5d 100644 (file)
@@ -6,13 +6,17 @@ repo_name = 'testrepo_clone'
 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")
   end
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
index 5ba7915..f545dab 100644 (file)
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index 0d3d1f6..8758435 100644 (file)
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index a88709f..3bc3e30 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
 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")
index 89844c3..dec275f 100644 (file)
@@ -8,7 +8,11 @@ exclude2 ='file2.txt'
 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")
index 10c0e8e..ba37930 100644 (file)
@@ -8,7 +8,11 @@ exclude2 ='ho398b'
 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")
index 709079d..59370eb 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 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")
index 7f4a9a4..5bc06ec 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 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")
index 8adb1af..6826673 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
 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")
index 2264015..9805355 100644 (file)
@@ -8,7 +8,11 @@ exclude1 = "`exec \"rm -rf /tmp\"`"
 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")
index f17d497..7ac4c4a 100644 (file)
@@ -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")
index ee910fd..8b7455d 100644 (file)
@@ -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")
index aeec31a..81d32c3 100644 (file)
@@ -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")
index fe1ee0a..12b60a3 100644 (file)
@@ -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")
index 071cc5e..66d2d5e 100644 (file)
@@ -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")
index 1ea0737..b60a9f7 100644 (file)
@@ -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")
index a8376d7..2f6b075 100644 (file)
@@ -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")
index c5f49e6..e74cca9 100644 (file)
@@ -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")
index 74fd112..59aaf21 100644 (file)
@@ -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")
index ba56621..b989e58 100644 (file)
@@ -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")
index abab7f1..e1373af 100644 (file)
@@ -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")
index 2485424..1253db1 100644 (file)
@@ -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")
index b72963b..ccb8a70 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_bare_repo_already_exists.git'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create bare repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     on(host, "mkdir #{tmpdir}/#{repo_name}")
     on(host, "cd #{tmpdir}/#{repo_name} && git --bare init")
   end
index f31dda0..8fb8543 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
 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")
index ece10a5..5b789df 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_bare.git'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
   end
 
   teardown do
index be5ae92..beea7b8 100644 (file)
@@ -7,7 +7,11 @@ group = 'mygroup'
 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")
index c204792..319a8e7 100644 (file)
@@ -7,7 +7,11 @@ group = 'mygroup'
 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")
index 6147549..e5b9cf2 100644 (file)
@@ -7,13 +7,17 @@ group = 'mygroup'
 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")
   end
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
index 43c3f2e..bf86f2e 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index 6825df3..c4c645f 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index 0bcf143..c65acc4 100644 (file)
@@ -7,7 +7,11 @@ group = 'mygroup'
 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")
index 87bad69..cccad19 100644 (file)
@@ -7,7 +7,11 @@ group = 'mygroup'
 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")
index 5388f7f..081642d 100644 (file)
@@ -7,7 +7,11 @@ group = 'mygroup'
 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")
index 7f0f1b2..85f1fcc 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_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")
index be84f0e..b17dc73 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_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")
index 93db164..c80eb81 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_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")
index 52349d7..69a7fe2 100644 (file)
@@ -6,13 +6,17 @@ repo_name = 'testrepo_revision_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")
   end
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
index 8101794..7cac163 100644 (file)
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index adab3a8..1c705a5 100644 (file)
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index fb6a20a..b5dbd24 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_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")
index 9325a0b..222653e 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_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")
index d82e3c6..f01a488 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
index 961d0fe..47fb338 100644 (file)
@@ -7,7 +7,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
index 956d7de..723a0b6 100644 (file)
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index c80faa0..869620d 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
index fdf4977..a40a204 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
index f54f1ab..9e2abe2 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
@@ -36,7 +40,7 @@ hosts.each do |host|
     end
 
     on(host, "wc -l #{tmpdir}/#{repo_name}/.git/shallow") do |res|
-      fail_test('shallow not found') unless res.stdout.include? "2 #{tmpdir}/#{repo_name}/.git/shallow"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index ab3bd07..49683d2 100644 (file)
@@ -6,13 +6,17 @@ repo_name = 'testrepo_shallow_clone'
 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")
   end
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
@@ -41,7 +45,7 @@ hosts.each do |host|
     end
 
     on(host, "wc -l #{tmpdir}/#{repo_name}/.git/shallow") do |res|
-      fail_test('shallow not found') unless res.stdout.include? "2 #{tmpdir}/#{repo_name}/.git/shallow"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index 93a328c..2392728 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
@@ -57,7 +61,7 @@ hosts.each do |host|
     end
 
     on(host, "wc -l #{tmpdir}/#{repo_name}/.git/shallow") do |res|
-      fail_test('shallow not found') unless res.stdout.include? "2 #{tmpdir}/#{repo_name}/.git/shallow"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index ddef4e7..1d5b35a 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
@@ -47,7 +51,7 @@ hosts.each do |host|
     end
 
     on(host, "wc -l #{tmpdir}/#{repo_name}/.git/shallow") do |res|
-      fail_test('shallow not found') unless res.stdout.include? "2 #{tmpdir}/#{repo_name}/.git/shallow"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index da5528c..0f00b30 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
@@ -47,7 +51,7 @@ hosts.each do |host|
     end
 
     on(host, "wc -l #{tmpdir}/#{repo_name}/.git/shallow") do |res|
-      fail_test('shallow not found') unless res.stdout.include? "2 #{tmpdir}/#{repo_name}/.git/shallow"
+      fail_test('shallow not found') unless res.stdout.include? "1 #{tmpdir}/#{repo_name}/.git/shallow"
     end
   end
 
index eb8b121..34c624f 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 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")
index 04dd014..1849f02 100644 (file)
@@ -6,7 +6,11 @@ repo_name = 'testrepo_tag_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")
index 8929b0b..9c74485 100644 (file)
@@ -7,7 +7,11 @@ tag = '0.0.2'
 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")
index 33d7f41..01f319c 100644 (file)
@@ -7,7 +7,11 @@ tag = '0.0.2'
 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")
index 694626e..42e689c 100644 (file)
@@ -7,13 +7,17 @@ tag = '0.0.2'
 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")
   end
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
index bb211c1..3ea363c 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index 95a98f5..d508c43 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index f7af937..cb96b4e 100644 (file)
@@ -7,7 +7,11 @@ tag = '0.0.2'
 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")
index 006646a..bc416e8 100644 (file)
@@ -7,7 +7,11 @@ tag = '0.0.2'
 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")
index 19af709..245e175 100644 (file)
@@ -7,7 +7,11 @@ user = 'myuser'
 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")
index 9133661..ccd9ad4 100644 (file)
@@ -7,7 +7,11 @@ user = 'myuser'
 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")
index 1104fdd..602769d 100644 (file)
@@ -7,7 +7,11 @@ user = 'myuser'
 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")
index 1fb61b6..af2ffb7 100644 (file)
@@ -7,13 +7,17 @@ user = 'myuser'
 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")
   end
   step 'setup - start git daemon' do
-    install_package(host, 'git-daemon')
+    install_package(host, 'git-daemon') unless host['platform'] =~ /debian|ubuntu/
     on(host, "git daemon --base-path=#{tmpdir}  --export-all --reuseaddr --verbose --detach")
   end
 
index 03ea27b..e8713e5 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index 7348755..4e633d7 100644 (file)
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   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")
index dccf9f8..98efb46 100644 (file)
@@ -7,7 +7,11 @@ user = 'myuser'
 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")
index 5ee01b1..cfd521e 100644 (file)
@@ -7,7 +7,11 @@ user = 'myuser'
 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")
index 262cb62..6b5fd46 100644 (file)
@@ -6,6 +6,7 @@ test_name "Installing Puppet and vcsrepo module" do
         install_pe
       else
         install_puppet
+        on hosts, "mkdir -p #{hosts.first['distmoduledir']}"
       end
     end
   end
@@ -19,6 +20,6 @@ test_name "Installing Puppet and vcsrepo module" do
        email = root@localhost
        name = root
 EOS
-    create_remote_file(host, "/root/.gitconfig", script)
+    create_remote_file(hosts.first, "/root/.gitconfig", gitconfig)
   end
 end
index d0d84d0..c371f1f 100644 (file)
@@ -7,6 +7,7 @@ unless ENV['RS_PROVISION'] == 'no'
       install_pe
     else
       install_puppet
+      on hosts, "mkdir -p #{hosts.first['distmoduledir']}"
     end
   end
 end