diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-16 13:56:09 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-16 13:56:09 -0700 |
| commit | 7ac009164f77092801d813c5ad514d8e3aa77323 (patch) | |
| tree | 697084e56663be03f8739a94fabb73393d61564a /spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb | |
| parent | 36969f9a2fe8952f162ef1dea9cfa95ed16c1907 (diff) | |
| parent | e6a561125b6477051c339d5dfce909e4318f504c (diff) | |
| download | puppet-vcsrepo-7ac009164f77092801d813c5ad514d8e3aa77323.tar.gz puppet-vcsrepo-7ac009164f77092801d813c5ad514d8e3aa77323.tar.bz2 | |
Merge branch 'fix-git-package-ubuntu-10' into 1.0.x
Diffstat (limited to 'spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb')
| -rw-r--r-- | spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 43c3f2e..bf86f2e 100644 --- a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb +++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb @@ -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") |