(maint) Use correct providers to install gems #47
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
bmjen
reviewed
Nov 8, 2016
| on host, puppet('resource package hocon provider=puppet_gem') | ||
| end | ||
| else | ||
| on host, puppet('resource package hocon provider=gem') |
There was a problem hiding this comment.
right above this...
on host, puppet('resource package rubygems')
HAIL9000
force-pushed
the
maint/master/correct_hocon_gem_installation_in_acceptance_tests
branch
2 times, most recently
from
07d6416
to
831a19d
Compare
bmjen
reviewed
Nov 10, 2016
| @@ -5,7 +5,18 @@ | |||
| unless ENV['RS_PROVISION'] == 'no' | |||
| run_puppet_install_helper | |||
| hosts.each do |host| | |||
| on host, puppet('resource package hocon provider=puppet_gem') | |||
| puppet_version = (on default, puppet('--version')).output.chomp | |||
There was a problem hiding this comment.
Sorry @HAIL9000 this whole block needs to be
if ENV['PUPPET_INSTALL_TYPE'] == 'pe' and Gem::Version.new(puppet_version) < Gem::Version.new('4.0.0')
on host, puppet('resource package hocon provider=pe_gem')
elsif Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0')
on host, puppet('resource package hocon provider=puppet_gem')
else
on host, puppet('resource package hocon provider=gem')
end
831a19d
to
9b7b508
Compare
Prior to this commit, the test setup was using the same gem provider for PE and FOSS and all versions. Correct this so that it using the correct provider with certain versions of puppet and PE.
HAIL9000
force-pushed
the
maint/master/correct_hocon_gem_installation_in_acceptance_tests
branch
from
9b7b508
to
a06d600
Compare
|
@bmjen Updated! Looks like we're finally green! |
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.
Prior to this commit, the test setup was using the same gem
provider for PE and FOSS and all versions. Correct this so that
it using the correct provider with certain versions of puppet and
PE.