Merge branch 'main' into rename_disk_transfer_rate_bytes_metric

OhadRevah · web-flow · commit 66d9b1335774 · 2025-11-19T15:28:15.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -5,3 +5,5 @@
 .pytest_cache/
 .tox
 .venv/
+# Test data collection output directories
+tests-collected-info/
diff --git a/.github/workflows/close-stale-prs.yml b/.github/workflows/close-stale-prs.yml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           stale-pr-message: 'This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
           close-pr-message: 'This PR was closed because it has not been updated in past 30 days.'
diff --git a/.github/workflows/component-builder-publish.yml b/.github/workflows/component-builder-publish.yml
@@ -20,7 +20,7 @@ jobs:
       DEBIAN_FRONTEND: noninteractive
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install dependencies for VM build
         run: |
           sudo apt-get update
@@ -36,7 +36,7 @@ jobs:
         working-directory: ./containers/fedora
         run: wget -q "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/${{ env.FEDORA_IMAGE }}"
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           version: "0.8.22"
       - name: Create VM
diff --git a/.github/workflows/component-builder.yml b/.github/workflows/component-builder.yml
@@ -18,7 +18,7 @@ jobs:
       DEBIAN_FRONTEND: noninteractive
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install dependencies for VM build
         run: |
           sudo apt-get update
@@ -34,7 +34,7 @@ jobs:
         working-directory: ./containers/fedora
         run: wget -q "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/${{ env.FEDORA_IMAGE }}"
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           version: "0.8.22"
       - name: Create VM
@@ -54,7 +54,7 @@ jobs:
           podman save -o artifacts/fedora-image.tar "${remote_repository}":"${arch_tag}"
           echo "Saved image to artifacts/fedora-image.tar"
       - name: Upload container image artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: fedora-container-image
           path: artifacts/fedora-image.tar
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -9,6 +9,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v5
+      - uses: actions/labeler@v6
         with:
           sync-labels: true
diff --git a/.github/workflows/request-coderabbit-test-instructions.yml b/.github/workflows/request-coderabbit-test-instructions.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Create or update comment
         if: steps.check-user-team.outputs.is-member != 'true'
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.pull_request.number }}
           token: ${{ secrets.BOT3_TOKEN }}
diff --git a/.github/workflows/utilities-unit-tests.yml b/.github/workflows/utilities-unit-tests.yml
@@ -24,13 +24,13 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
diff --git a/docs/QUARANTINE.md b/docs/QUARANTINE.md
@@ -0,0 +1,2 @@
+## TODO: Add full procedure for quarantine and de-quarantine
+## De-quarantine: add a section on pytest-repeat and how to use it
diff --git a/pyproject.toml b/pyproject.toml
@@ -56,7 +56,7 @@ dependencies = [
   "pexpect>=4.9.0",
   "podman>=5.2.0",
   "pyhelper-utils>=1.0.1",
-  "pytest>=8.3.3",
+  "pytest>=9.0.0",
   "pytest-benchmark>=5.1.0",
   "pytest-dependency>=0.6.0",
   "pytest-jira~=0.3.21",
@@ -84,7 +84,7 @@ dependencies = [
 [project.optional-dependencies]
 # Dependencies for utilities unit testing
 utilities-test = [
-  "pytest>=8.3.3",
+  "pytest>=9.0.0",
   "pytest-cov>=4.1.0",
   "pytest-mock>=3.14.0",
   "pytest-xdist>=3.5.0",
@@ -99,13 +99,14 @@ packages = ["*"]
 dev = [
     "ipdb>=0.13.13",
     "ipython>=8.12.3",
+    "pytest-repeat>=0.9.4",
 ]
 
 [tool.uv.sources]
 
 # Utilities Unit Testing Configuration
 [tool.pytest.ini_options]
-minversion = "8.0"
+minversion = "9.0"
 testpaths = ["utilities/unittests"]
 python_files = "test_*.py"
 python_classes = "Test*"
diff --git a/renovate.json b/renovate.json
@@ -18,6 +18,15 @@
     {
       "matchPackagePatterns": ["*"],
       "groupName": "python-deps"
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["quay.io/fedora/fedora"],
+      "enabled": false
+    },
+    {
+      "matchPackageNames": ["marshmallow"],
+      "enabled": false
     }
   ]
 }
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -2056,9 +2056,8 @@ def artifactory_setup(pytestconfig):
 
 
 @pytest.fixture(autouse=True)
-@pytest.mark.early(order=0)
 def autouse_fixtures(
-    leftovers_cleanup,  # Must be called first to avoid delete created resources.
+    leftovers_cleanup,  # Must be called first to avoid deleting created resources.
     artifactory_setup,
     bin_directory_to_os_path,
     cluster_info,
diff --git a/tests/infrastructure/conftest.py b/tests/infrastructure/conftest.py
@@ -20,7 +20,6 @@ def xfail_if_no_huge_pages(hugepages_gib_values):
 
 
 @pytest.fixture(scope="session")
-@pytest.mark.usefixtures("xfail_if_no_huge_pages")
-def hugepages_gib_max(hugepages_gib_values):
+def hugepages_gib_max(xfail_if_no_huge_pages, hugepages_gib_values):
     """Return the maximum 1Gi hugepage size, capped at 64Gi."""
     return min(max(hugepages_gib_values), 64)
diff --git a/tests/virt/cluster/common_templates/utils.py b/tests/virt/cluster/common_templates/utils.py
@@ -531,7 +531,7 @@ def _check_hyperv_recommendations():
         ]
 
         if failed_vm_recommendations:
-            failed_recommendations.append(failed_vm_recommendations)
+            failed_recommendations.extend(failed_vm_recommendations)
 
         spinlocks = vm_recommendations_dict["SpinlockRetries"]
         if int(spinlocks) != 8191:
@@ -575,7 +575,7 @@ def _check_hyperv_features():
     failed_windows_hyperv_list.extend(_check_hyperv_features())
 
     if not hvinfo_dict["HyperVsupport"]:
-        failed_windows_hyperv_list.extend("HyperVsupport")
+        failed_windows_hyperv_list.append("HyperVsupport")
 
     assert not failed_windows_hyperv_list, (
         f"The following hyperV flags are not set correctly in the guest: {failed_windows_hyperv_list}\n"
diff --git a/utilities/console.py b/utilities/console.py
@@ -43,8 +43,12 @@ def __init__(
         """
         self.vm = vm
         # TODO: `BaseVirtualMachine` does not set cloud-init so the VM is using predefined credentials
-        self.username = username or getattr(self.vm, "login_params", {}).get("username") or self.vm.username
-        self.password = password or getattr(self.vm, "login_params", {}).get("password") or self.vm.password
+        self.username = (
+            username or getattr(self.vm, "login_params", {}).get("username") or self.vm.username  # type: ignore[attr-defined]  # noqa: E501
+        )
+        self.password = (
+            password or getattr(self.vm, "login_params", {}).get("password") or self.vm.password  # type: ignore[attr-defined]  # noqa: E501
+        )
         self.timeout = timeout
         self.child = None
         self.login_prompt = "login:"
diff --git a/utilities/constants.py b/utilities/constants.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from kubernetes.dynamic.exceptions import InternalServerError
 from ocp_resources.aaq import AAQ
 from ocp_resources.api_service import APIService
@@ -886,7 +888,7 @@ class NamespacesNames:
 
 HCO_DEFAULT_CPU_MODEL_KEY = "defaultCPUModel"
 
-HPP_CAPABILITIES = {
+HPP_CAPABILITIES: dict[str, Any] = {
     VOLUME_MODE: DataVolume.VolumeMode.FILE,
     ACCESS_MODE: DataVolume.AccessMode.RWO,
     "snapshot": False,
diff --git a/utilities/data_collector.py b/utilities/data_collector.py
@@ -163,6 +163,9 @@ def prepare_pytest_item_data_dir(item, output_dir):
     """
     item_cls_name = item.cls.__name__ if item.cls else ""
     tests_path = item.session.config.inicfg.get("testpaths")
+    # As of pytest 9, this is a ConfigValue object
+    if hasattr(tests_path, "value"):
+        tests_path = tests_path.value
     assert tests_path, "pytest.ini must include testpaths"
 
     fspath_split_str = "/" if tests_path != os.path.split(item.fspath.dirname)[1] else ""
diff --git a/utilities/infra.py b/utilities/infra.py
@@ -254,10 +254,10 @@ def get_pod_container_error_status(pod: Pod) -> str | None:
         raise
 
 
-def get_not_running_pods(pods: list[Pod], filter_pods_by_name: str = "") -> list[dict[str, str]]:
+def get_not_running_pods(pods: list[Pod], filter_pods_by_name: str = "") -> list[dict[str | None, str]]:
     pods_not_running = []
     for pod in pods:
-        if filter_pods_by_name and filter_pods_by_name in pod.name:
+        if filter_pods_by_name and filter_pods_by_name in pod.name:  # type: ignore[operator]
             LOGGER.warning(f"Ignoring pod: {pod.name} for pod state validations.")
             continue
         try:
diff --git a/utilities/pytest_utils.py b/utilities/pytest_utils.py
@@ -145,21 +145,20 @@ def separator(symbol_, val=None):
 
 def reorder_early_fixtures(metafunc):
     """
-    Put fixtures with `pytest.mark.early` first during execution
+    Reorders fixtures based on a predefined list of fixtures which must run first.
 
-    This allows patch of configurations before the application is initialized
-
-    Due to the way pytest collects fixtures, marks must be placed below
-    @pytest.fixture — which is to say, they must be applied BEFORE @pytest.fixture.
+    Args:
+        metafunc: pytest metafunc
     """
+    use_early_fixture_names = ["autouse_fixtures"]
+
     for fixturedef in metafunc._arg2fixturedefs.values():
-        fixturedef = fixturedef[0]
-        for mark in getattr(fixturedef.func, "pytestmark", []):
-            if mark.name == "early":
-                mark_order = mark.kwargs.get("order", 0)
-                order = metafunc.fixturenames
-                order.insert(mark_order, order.pop(order.index(fixturedef.argname)))
-                break
+        name = fixturedef[0].argname
+        if name in use_early_fixture_names:
+            order = use_early_fixture_names.index(name)
+            fixtures_list = metafunc.fixturenames
+            fixtures_list.insert(order, fixtures_list.pop(fixtures_list.index(name)))
+            break
 
 
 def stop_if_run_in_progress():
diff --git a/utilities/unittests/conftest.py b/utilities/unittests/conftest.py
@@ -5,6 +5,7 @@
 import os
 import sys
 from pathlib import Path
+from typing import Any
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -19,7 +20,12 @@
 
 # Mock get_client to prevent K8s API calls
 
-resource.get_client = lambda: MagicMock()
+
+def _mock_get_client(*args: Any, **kwargs: Any) -> MagicMock:  # type: ignore[misc]
+    return MagicMock()
+
+
+resource.get_client = _mock_get_client  # type: ignore[assignment]
 
 # Create mock modules to break circular imports
 # Set up mock modules before any imports
diff --git a/utilities/unittests/test_data_collector.py b/utilities/unittests/test_data_collector.py
@@ -461,6 +461,31 @@ def test_prepare_pytest_item_data_dir_missing_testpaths(self):
         with pytest.raises(AssertionError, match="pytest.ini must include testpaths"):
             prepare_pytest_item_data_dir(mock_item, "/output")
 
+    @patch("os.makedirs")
+    @patch("os.path.split")
+    def test_prepare_pytest_item_data_dir_with_configvalue(self, mock_split, mock_makedirs):
+        """Test prepare_pytest_item_data_dir with pytest 9 ConfigValue object"""
+        mock_split.return_value = ("/some/path", "test_dir")
+
+        # Mock pytest 9's ConfigValue object
+        class ConfigValue:
+            def __init__(self, value):
+                self.value = value
+
+        # Mock pytest item
+        mock_item = MagicMock()
+        mock_item.cls.__name__ = "TestMyClass"
+        mock_item.name = "test_my_function"
+        mock_item.fspath.dirname = "/home/user/git/test-repo/tests/test_dir"
+        mock_item.fspath.basename = "test_something.py"
+        mock_item.session.config.inicfg.get.return_value = ConfigValue("tests")
+
+        result = prepare_pytest_item_data_dir(mock_item, "/output")
+
+        expected_path = "/output/test_dir/test_something/TestMyClass/test_my_function"
+        assert result == expected_path
+        mock_makedirs.assert_called_once_with(expected_path, exist_ok=True)
+
     @patch("os.makedirs")
     @patch("os.path.split")
     def test_prepare_pytest_item_data_dir_without_class(self, mock_split, mock_makedirs):
diff --git a/utilities/unittests/test_pytest_utils.py b/utilities/unittests/test_pytest_utils.py
diff --git a/utilities/virt.py b/utilities/virt.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+## TODO: Add full procedure for quarantine and de-quarantine`
	`2`	`+## De-quarantine: add a section on pytest-repeat and how to use it`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,15 @@`
`18`	`18`	`{`
`19`	`19`	`"matchPackagePatterns": ["*"],`
`20`	`20`	`"groupName": "python-deps"`
	`21`	`+ },`
	`22`	`+ {`
	`23`	`+ "matchDatasources": ["docker"],`
	`24`	`+ "matchPackageNames": ["quay.io/fedora/fedora"],`
	`25`	`+ "enabled": false`
	`26`	`+ },`
	`27`	`+ {`
	`28`	`+ "matchPackageNames": ["marshmallow"],`
	`29`	`+ "enabled": false`
`21`	`30`	`}`
`22`	`31`	`]`
`23`	`32`	`}`