Skip to content

Commit 734acec

Browse files
authored
Merge pull request voxpupuli#512 from ekohl/spec-helper-acceptance
Clean up acceptance spec helper
2 parents fc89de2 + 0eeecab commit 734acec

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

spec/spec_helper_acceptance.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
require 'beaker/module_install_helper'
55

66
run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
7-
install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
8-
install_module_on(hosts)
9-
install_module_dependencies_on(hosts)
107

118
RSpec.configure do |c|
129
# Readable test descriptions
1310
c.formatter = :documentation
14-
hosts.each do |host|
15-
if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker}
16-
on(host, "sed -i '/nodocs/d' /etc/yum.conf")
17-
end
11+
12+
# Configure all nodes in nodeset
13+
c.before :suite do
14+
install_module
15+
install_module_dependencies
1816
end
1917
end

0 commit comments

Comments
 (0)