|
3 | 3 | require 'spec_helper_common'
|
4 | 4 |
|
5 | 5 | unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
|
6 |
| - if hosts.first.is_pe? |
7 |
| - install_pe |
| 6 | + # This will install the latest available package on el and deb based |
| 7 | + # systems fail on windows and osx, and install via gem on other *nixes |
| 8 | + foss_opts = {:default_action => 'gem_install'} |
| 9 | + |
| 10 | + if default.is_pe?; then |
| 11 | + install_pe; |
8 | 12 | else
|
9 |
| - install_puppet |
| 13 | + install_puppet(foss_opts); |
10 | 14 | end
|
| 15 | + |
11 | 16 | hosts.each do |host|
|
12 | 17 | on hosts, "mkdir -p #{host['distmoduledir']}"
|
13 | 18 | end
|
|
25 | 30 | # Install module and dependencies
|
26 | 31 | puppet_module_install(:source => proj_root, :module_name => 'selenium')
|
27 | 32 | hosts.each do |host|
|
28 |
| - on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] } |
29 |
| - on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0,1] } |
30 |
| - on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0,1] } |
31 |
| - on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0,1] } |
| 33 | + on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0, 1] } |
| 34 | + on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0, 1] } |
| 35 | + on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0, 1] } |
| 36 | + on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0, 1] } |
32 | 37 | end
|
33 | 38 | end
|
34 | 39 | end
|
0 commit comments