Skip to content

Commit 2c72bde

Browse files
committed
update spec_helper_acceptance
1 parent 2b19d3d commit 2c72bde

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

spec/spec_helper_acceptance.rb

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
1-
require 'puppet'
21
require 'beaker-rspec'
3-
require 'yaml'
2+
require 'beaker/puppet_install_helper'
3+
require 'beaker/module_install_helper'
44

5-
install_puppet_agent_on hosts, {}
5+
run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
6+
install_module
7+
install_module_dependencies
68

79
RSpec.configure do |c|
8-
# Project root
9-
module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
10-
module_name = module_root.split('-').last
11-
1210
# Readable test descriptions
1311
c.formatter = :documentation
14-
15-
c.before :suite do
16-
# Install module and dependencies
17-
puppet_module_install(source: module_root, module_name: module_name)
18-
19-
modules_fixtures = YAML.load_file(module_root + '/.fixtures.yml')
20-
modules = modules_fixtures['fixtures']['repositories']
21-
22-
hosts.each do |host|
23-
modules.each do |_name, mod_url|
24-
mod_name = mod_url.split('/').last.sub('.git', '')
25-
on host, puppet('module', 'install', mod_name), acceptable_exit_codes: [0, 1]
26-
end
12+
hosts.each do |host|
13+
if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker}
14+
on(host, "sed -i '/nodocs/d' /etc/yum.conf")
2715
end
2816
end
2917
end

0 commit comments

Comments
 (0)