[3006.x] Make rpms more universal by replacing systemd_* scriptlets with RHEL7/8 styled forward-compatible definitions #66030
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
salt-project-bot-prod-environment
bot
changed the title
|
Requires a test review and updates to: The upgrades and downgrades need to:
Though, technically, if you downgrade to one of the older versions (v3006.6 and earlier), this test will fail because the RPMs used for older versions haven't been updated yet. So, this may be a case of ensuring it is setup for upgrade/downgrade service validation where the version is >3006.6 ?
|
s0undt3ch
previously approved these changes
Feb 13, 2024
There was a problem hiding this comment.
Don't know enough to validate the spec file changes.
@dwoz or @dmurphy18 ?
twangboy
previously approved these changes
Feb 14, 2024
dmurphy18
requested changes
Feb 14, 2024
dmurphy18
approved these changes
Feb 14, 2024
Looked up the actual code for the macros being replaced Made sure we're doing the proper if statements Cleaned up the tests a little
twangboy
force-pushed
the
make-rpms-more-universal
branch
from
a538e7e to
fbfba41
Compare
twangboy
approved these changes
Feb 14, 2024
s0undt3ch
approved these changes
Feb 14, 2024
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.
What does this PR do?
Uses systemd_* scriptlet definitions from RHEL 7/8 that are forward-compatible with RHEL 9, allowing for the RPMs to be built on newer systems while the built artifacts are still compatible with RHEL 7/8/9.
What issues does this PR fix or reference?
Fixes: #65987
Previous Behavior
systemd_*scriptlet definitions were not compatible with RHEL 7/8 systems (including Photon OS 3, Photon OS 4, AlmaLinux 8, etc.).New Behavior
systemd_*scriptlet definitions were used from RHEL 7/8 build macros, allowing for more universal compatibility on RHEL 7/8/9 systems, regardless of OS that package is built on. Definitions have been tested on RHEL 9 systemd and work as expected.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.