Fix the tests failing on AlmaLinux 10 and other clones

* Fix the package manager related tests failing with AlmaLinux 10

* Fix network test failing on NetworkManager only systems

* Align test conditions with upstream

Author: vzhestkov

tests/integration/states/test_network.py

@@ -25,6 +25,13 @@ def setUp(self):
                 "Network state only supported on RedHat and Debian based systems."
                 "The network state does not currently work on VMware Photon OS."
             )
+        if (
+            os_family == "RedHat"
+            and self.run_function("grains.get", ["osmajorrelease"]) >= 10
+        ):
+            self.skipTest(
+                "Network state doesn't fully support NetworkManager only systems."
+            )
 
     @pytest.mark.slow_test
     def test_managed(self):

tests/pytests/functional/states/pkgrepo/test_centos.py

@@ -242,7 +242,11 @@ def copr_pkgrepo_with_comments_name(pkgrepo, grains):
         or grains["os"] == "VMware Photon OS"
     ):
         pytest.skip("copr plugin not installed on {} CI".format(grains["osfinger"]))
-    if grains["os"] in ("CentOS Stream", "AlmaLinux") and grains["osmajorrelease"] == 9:
+    if (
+        grains["os"] in ("CentOS Stream", "AlmaLinux", "Rocky")
+        and grains["osmajorrelease"] >= 9
+        or grains["osfinger"] == "Amazon Linux-2023"
+    ):
         pytest.skip("No repo for {} in test COPR yet".format(grains["osfinger"]))
     pkgrepo_name = "hello-copr"
     try:

tests/pytests/functional/states/test_pkg.py

@@ -52,8 +52,8 @@ def PKG_TARGETS(grains):
         if grains["os"] == "VMware Photon OS":
             _PKG_TARGETS = ["wget", "zsh-html"]
         elif (
-            grains["os"] in ("CentOS Stream", "AlmaLinux")
-            and grains["osmajorrelease"] == 9
+            grains["os"] in ("CentOS Stream", "Rocky", "AlmaLinux")
+            and grains["osmajorrelease"] >= 9
         ):
             _PKG_TARGETS = ["units", "zsh"]
         else: