Add a check for Puppet version to task helper #722
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
willmeek
requested review from
tphoney,
pmcmaw,
david22swan,
HAIL9000 and
eputnam
glennsarti
reviewed
Nov 9, 2017
spec/spec_helper_acceptance.rb
Outdated
| @@ -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)} | |||
There was a problem hiding this comment.
This may not be the behaviour you want
This will install bolt if this is a PE install but the puppet version is not 5.x
There was a problem hiding this comment.
I think the original unless is the most valid. Install bolt if we're not installing PE
There was a problem hiding this comment.
Thanks Glenn, I've reverted the version check from the bolt install.
willmeek
force-pushed
the
release_check_puppet_ver
branch
from
0cc0938
to
a128054
Compare
|
@willmeek if you update the title and description I will get this merged for you. |
This commit will add a check for Puppet version being 5 or greater around the task test helper. This ensures that is it not attempted pre-task versions of puppet.
willmeek
force-pushed
the
release_check_puppet_ver
branch
from
a128054
to
bccf415
Compare
willmeek
changed the title
|
Thanks, updated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit will add a check for Puppet version being 5 or greater
around the task test helper. This ensures that is it not attempted
pre-task versions of puppet.