Skip to content

Commit

Permalink
Add a check for Puppet version to task and bolt helpers
Browse files Browse the repository at this point in the history
This commit will add a check for Puppet version being 5 or greater
around the task and bolt acceptance test helpers. This ensures that
they are not attempted on pre-task/bolt versions of puppet.
  • Loading branch information
Will Meek committed Nov 9, 2017
1 parent b3d1148 commit 0cc0938
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def pe_install?
end

run_puppet_install_helper
install_bolt_on(hosts) unless pe_install?
install_bolt_on(hosts) unless pe_install? && puppet_version =~ %r{(5\.\d\.\d)}
install_module_on(hosts)
install_module_dependencies_on(hosts)

Expand Down Expand Up @@ -88,6 +88,6 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e

# Configure all nodes in nodeset
c.before :suite do
run_puppet_access_login(user: 'admin') if pe_install?
run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)}
end
end

0 comments on commit 0cc0938

Please sign in to comment.