Fix CI for PE.next #283
Merged
Fix CI for PE.next #283
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
Solaris 11 doesn't ship the SSL CA root for the forgeapi server therefore we need to use a different way to deploy the module to the host. Since the location where puppet looks up the modules changed between PE 3.x and 2015.2, we need to figure out the correct location from the host that's being configured.
If the SUT doesn't have ntp installed at the beginning of the test run (like ubuntu 12.04) or when the package is removed and re-installed, the original code would not have deleted the hook script, as it was not available yet or would have been reinstated. Installing the package through the class then installed the hook and lead to failures of the kind this was trying to avoid. using dpkg-divert instead will move the file away everytime the package is installed by dpkg. # Conflicts: # spec/spec_helper_acceptance.rb
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.
I've run this branch manually through jenkins and it was green: https://jenkins-modules.puppetlabs.com/view/2.%20linux%20only/view/ntp/view/master/