Skip to content

Commit e5d006d

Browse files
committed
Revert PUP-8008 workaround
Since PUP-8008 is fixed in 4.10.9 and 5.3.3, this workaround is no longer needed.
1 parent babe5e4 commit e5d006d

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

spec/spec_helper_acceptance.rb

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,9 @@
1010

1111
UNSUPPORTED_PLATFORMS = %w[AIX windows Solaris Suse].freeze
1212

13-
# monkey patch to get around apt/forge issue (PUP-8008)
14-
module Beaker::ModuleInstallHelper
15-
include Beaker::DSL
16-
17-
def module_dependencies_from_metadata
18-
metadata = module_metadata
19-
return [] unless metadata.key?('dependencies')
20-
21-
dependencies = []
22-
23-
# get it outta here!
24-
metadata['dependencies'].delete_if { |d| d['name'] == 'puppetlabs/apt' }
25-
26-
metadata['dependencies'].each do |d|
27-
tmp = { module_name: d['name'].sub('/', '-') }
28-
29-
if d.key?('version_requirement')
30-
tmp[:version] = module_version_from_requirement(tmp[:module_name],
31-
d['version_requirement'])
32-
end
33-
dependencies.push(tmp)
34-
end
35-
36-
dependencies
37-
end
38-
end
39-
4013
install_bolt_on(hosts) unless pe_install?
4114
install_module_on(hosts)
4215
install_module_dependencies_on(hosts)
43-
install_module_from_forge_on(hosts, 'puppetlabs/apt', '< 4.2.0')
4416

4517
DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
4618
'vagrant'

0 commit comments

Comments
 (0)