[3006.x] Remove psutil_compat.py file, (RHEL 6 EOL era file) and fix pkg downgrade test

changelog/66467.removed.md

@@ -0,0 +1 @@
+Remove psutil_compat.py file, which should have been removed when RHEL 6 EOL

requirements/pytest.txt

@@ -13,3 +13,5 @@ flaky
 more-itertools
 pyfakefs
 trustme
+pytest-skip-markers >= 1.5.2 ; python_version >= '3.8'
+pytest-skip-markers <= 1.5.1 ; python_version < '3.8'

requirements/static/ci/py3.10/cloud.txt

@@ -482,9 +482,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/darwin.txt

@@ -337,8 +337,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/freebsd.txt

@@ -330,8 +330,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/linux.txt

@@ -347,8 +347,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.10/windows.txt

@@ -308,8 +308,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/cloud.txt

@@ -446,9 +446,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/darwin.txt

@@ -308,8 +308,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/freebsd.txt

@@ -307,8 +307,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/linux.txt

@@ -324,8 +324,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.11/windows.txt

@@ -304,8 +304,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/cloud.txt

@@ -446,9 +446,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/darwin.txt

@@ -308,8 +308,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/freebsd.txt

@@ -307,8 +307,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/linux.txt

@@ -324,8 +324,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.12/windows.txt

@@ -304,8 +304,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/cloud.txt

@@ -530,9 +530,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/freebsd.txt

@@ -371,8 +371,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/linux.txt

@@ -383,8 +383,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.7/windows.txt

@@ -323,8 +323,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.0 ; python_version < "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/cloud.txt

@@ -516,9 +516,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/freebsd.txt

@@ -357,8 +357,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/linux.txt

@@ -369,8 +369,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.8/windows.txt

@@ -309,8 +309,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/cloud.txt

@@ -518,9 +518,10 @@ pytest-shell-utilities==1.8.0
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/darwin.txt

@@ -366,8 +366,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/freebsd.txt

@@ -359,8 +359,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/linux.txt

@@ -369,8 +369,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

requirements/static/ci/py3.9/windows.txt

@@ -310,8 +310,9 @@ pytest-salt-factories==1.0.1
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
-pytest-skip-markers==1.5.0
+pytest-skip-markers==1.5.2 ; python_version >= "3.8"
     # via
+    #   -r requirements/pytest.txt
     #   pytest-salt-factories
     #   pytest-shell-utilities
     #   pytest-system-statistics

salt/utils/platform.py

@@ -228,7 +228,11 @@ def is_aarch64():
     """
     Simple function to return if host is AArch64 or not
     """
-    return platform.machine().startswith("aarch64")
+    if is_darwin():
+        # Allow for MacOS Arm64 platform returning differently from Linux
+        return platform.machine().startswith("arm64")
+    else:
+        return platform.machine().startswith("aarch64")
 
 
 def spawning_platform():

tests/pytests/pkg/downgrade/test_salt_downgrade.py

@@ -47,7 +47,7 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
         original_py_version = install_salt.package_python_version()
 
     # Verify current install version is setup correctly and works
-    ret = salt_call_cli.run("test.version")
+    ret = salt_call_cli.run("--local", "test.version")
     assert ret.returncode == 0
     assert packaging.version.parse(ret.data) == packaging.version.parse(
         install_salt.artifact_version
@@ -76,6 +76,14 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
     # Downgrade Salt to the previous version and test
     install_salt.install(downgrade=True)
 
+    time.sleep(10)  # give it some time
+    # downgrade install will stop services on Debian/Ubuntu
+    # This is due to RedHat systems are not active after an install, but Debian/Ubuntu are active after an install
+    # want to ensure our tests start with the config settings we have set,
+    # trying restart for Debian/Ubuntu to see the outcome
+    if install_salt.distro_id in ("ubuntu", "debian"):
+        install_salt.restart_services()
+
     time.sleep(60)  # give it some time
 
     # Verify there is a new running minion by getting its PID and comparing it
@@ -99,7 +107,7 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
         ret.stdout.strip().split()[1]
     ) < packaging.version.parse(install_salt.artifact_version)
 
-    if is_downgrade_to_relenv:
+    if is_downgrade_to_relenv and not platform.is_darwin():
         new_py_version = install_salt.package_python_version()
         if new_py_version == original_py_version:
             # test pip install after a downgrade