diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-18 14:00:46 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-18 14:00:46 -0700 |
commit | b1f2c00ca300d6c22833b2af7af0839ad751966a (patch) | |
tree | 6c3d9acbc4d1c4a781fde6229310e9ffa69f2a0e /spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb | |
parent | d23a098c2deba9fb79ca53e2d51a8177b0f071af (diff) | |
parent | bb3b5283fc40226cad5a616b93bef492dba37f25 (diff) | |
download | puppet-vcsrepo-b1f2c00ca300d6c22833b2af7af0839ad751966a.tar.gz puppet-vcsrepo-b1f2c00ca300d6c22833b2af7af0839ad751966a.tar.bz2 |
Merge remote-tracking branch 'puppetlabs/1.0.x'
Diffstat (limited to 'spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb')
-rw-r--r-- | spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb index 1fb61b6..af2ffb7 100644 --- a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb +++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb @@ -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 |