Merge pull request voxpupuli#512 from ekohl/spec-helper-acceptance

baurmatt · web-flow · commit 734acec844a6 · 2019-11-26T13:57:57.000+01:00
Clean up acceptance spec helper
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -4,16 +4,14 @@
 require 'beaker/module_install_helper'
 
 run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
-install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
-install_module_on(hosts)
-install_module_dependencies_on(hosts)
 
 RSpec.configure do |c|
   # Readable test descriptions
   c.formatter = :documentation
-  hosts.each do |host|
-    if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker}
-      on(host, "sed -i '/nodocs/d' /etc/yum.conf")
-    end
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+    install_module
+    install_module_dependencies
   end
 end
