Merge pull request #647 from bmjen/unpin-apt

Unpins apt 1.8 dependency in fixtures.yml and spec_helper_acceptance.
This commit is contained in:
Morgan Haskel 2015-06-22 09:38:00 -07:00
commit ad3e042fbb
2 changed files with 2 additions and 4 deletions

View file

@ -1,8 +1,6 @@
fixtures:
repositories:
apt:
repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
branch: "1.8.x"
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

View file

@ -99,7 +99,7 @@ RSpec.configure do |c|
end
on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-apt', '--version', '1.8.0', '--force'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','--force','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
end