[3006.x] Remove psutil_compat.py file, (RHEL 6 EOL era file) and fix pkg downgrade test #66763
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
dmurphy18
added
test:slow
This was referenced Aug 9, 2024
twangboy
approved these changes
Aug 9, 2024
dwoz
requested changes
Aug 9, 2024
| @@ -821,14 +837,21 @@ def install_previous(self, downgrade=False): | |||
| self._install_ssm_service() | |||
|
|
|||
| elif platform.is_darwin(): | |||
| if relenv and platform.is_aarch64(): | |||
There was a problem hiding this comment.
Seems like this could be simplified
if platform.is_aarch64():
arch = "arm64"
else:
arch = "x86_64"
There was a problem hiding this comment.
Yes, I thought of cleaning up and removing classic stuff, but I wanted to minimize the changes and use the format, used in the existing other code, in the hope to minimize changes and have the tests run cleanly.
Always time to go back and do it better 🤣 . Planning with #66672 to go through and clean up all that classic stuff, since pre-3006 is no longer supported.
2 tasks
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?
Removes file psutil_compat.py which provided support for psutil < 2.0, which should have been removed when RHEL 6 reached End Of Life. And fix downgrade package tests for Debian/Ubuntu systems.
What issues does this PR fix or reference?
Fixes #66467
Previous Behavior
Generated Deprecation Warnings (added 4 months ago), the file should have been removed then.
Fix package downgrade tests failing on Ubuntu 24.04 arm64
New Behavior
Removed the file, which is no longer used, esp. in onedir architecture where Salt controls psutil verson uuesd (currently 5.8.0)
Fixed package downgrade tests
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, including the
PR Guidelines.
See GitHub's page on GPG signing for more information about signing commits with GPG.