(MODULES-7758) Properly handle distro tag for Fedora platforms #321
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
ekinanp
commented
Sep 5, 2018
| $dist_tag = "fc${::operatingsystemmajrelease}" | ||
| } elsif (versioncmp("${package_version}", '5.5.3') > 0) { | ||
| $dist_tag = "fedora${::operatingsystemmajrelease}" | ||
| } else { |
There was a problem hiding this comment.
Note that the PC1 collection will always hit the else branch since the agent version's older than 5.5.3, which is what we want.
|
I've tested the code here on several upgrade paths (on top of the unit tests): The upgrades all pass, so this should be good to go once CI passes. |
There were some recent changes made to remove the 'f' prefix for our older Fedora platforms, specifically Fedora 26 and 27. However, this inadvertently changed our distro tag for these platforms to also remove the 'f' prefix so that e.g. fedoraf26 became fedora26. This change was not carried over to the puppet_agent module. Furthermore, newer Fedora platforms like Fedora 28 use the newer fc<major_version> distro tag for the puppet5 collection. The puppet_agent module was also not updated with this change. Thus, some agent upgrades were failing on our Fedora platforms. This commit updates the puppet_agent module to handle all possible cases of the distro tag for our Fedora platforms.
ekinanp
force-pushed
the
fix-fedora-upgrades
branch
from
1d492b2 to
65a80ea
Compare
|
CLA signed by all contributors. |
smcclellan
approved these changes
Sep 11, 2018
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.
There were some recent changes made to remove the 'f' prefix for our
older Fedora platforms, specifically Fedora 26 and 27. However, this
inadvertently changed our distro tag for these platforms to also remove
the 'f' prefix so that e.g. fedoraf26 became fedora26. This change was not
carried over to the puppet_agent module. Furthermore, newer Fedora
platforms like Fedora 28 use the newer fc<major_version> distro tag
for the puppet5 collection. The puppet_agent module was also not
updated with this change. Thus, some agent upgrades were failing on our
Fedora platforms.
This commit updates the puppet_agent module to handle all possible cases
of the distro tag for our Fedora platforms.