chore: remove dependency on pytest-jira plugin and use xfail with condition for that (#1268)

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>

Author: dbasunag

docs/GETTING_STARTED.md

@@ -135,11 +135,30 @@ To skip RHOAI/ODH-related tests (for example when running in upstream), pass `--
 
 To run tests with admin client only, pass `--tc=use_unprivileged_client:False` to pytest.
 
-### jira integration
 
-To skip running tests which have open bugs, [pytest_jira](https://github.com/rhevm-qe-automation/pytest_jira) plugin is used.
-To run tests with jira integration, you need to set `PYTEST_JIRA_URL`, `PYTEST_JIRA_USERNAME` and `PYTEST_JIRA_TOKEN` environment variables.
-To make a test with jira marker, add: `@pytest.mark.jira(jira_id="RHOAIENG-0000", run=False)` to the test.
+### Skipping tests for known Jira issues
+
+To skip a test that is affected by a known Jira bug, use `pytest.mark.xfail` with `is_jira_issue_open` as the condition:
+
+```python
+from utilities.jira import is_jira_issue_open
+
+@pytest.mark.xfail(condition=is_jira_issue_open(jira_id="RHOAIENG-12345"), reason="RHOAIENG-12345", run=False)
+def test_example(self):
+    ...
+```
+
+- `condition=is_jira_issue_open(...)` checks the Jira issue status at collection time. If the issue is open, the test is marked as xfail.
+- `run=False` skips execution entirely while the issue is open. Once the issue is closed/resolved, the test runs normally.
+- If Jira is unreachable, the issue is assumed open and the test is skipped.
+
+The following environment variables must be set for Jira connectivity:
+
+```bash
+export PYTEST_JIRA_URL=<your_jira_url>
+export PYTEST_JIRA_USERNAME=<username>
+export PYTEST_JIRA_TOKEN=<token>
+```
 
 ### Running containerized tests
 

pyproject.toml

@@ -61,7 +61,7 @@ dependencies = [
     "grpcio-reflection",
     "portforward>=0.7.1",
     "pytest-testconfig>=0.2.0",
-    "pytest-jira>=0.3.21",
+
     "pygithub>=2.5.0",
     "timeout-sampler>=1.0.6",
     "shortuuid>=1.0.13",

pytest.ini

@@ -5,7 +5,7 @@ testpaths = tests
 markers =
     # General
     polarion: Store polarion test ID
-    jira: Store jira bug ID
+
     skip_on_disconnected: Mark tests that can only be run in deployments with Internet access i.e. not on disconnected clusters.
     parallel: marks tests that can run in parallel along with pytest-xdist
 
@@ -63,6 +63,3 @@ addopts =
     --show-progress
     --tc-file=tests/global_config.py
     --tc-format=python
-    --jira
-    --jira-connection-error-strategy=skip
-    --jira-disable-docs-search

tests/model_serving/model_server/kserve/authentication/test_kserve_token_authentication_raw.py

@@ -5,6 +5,7 @@
 from utilities.constants import Annotations, Protocols
 from utilities.inference_utils import Inference
 from utilities.infra import check_pod_status_in_time, get_pods_by_isvc_label
+from utilities.jira import is_jira_issue_open
 from utilities.manifests.onnx import ONNX_INFERENCE_CONFIG
 
 pytestmark = pytest.mark.usefixtures("valid_aws_config")
@@ -49,7 +50,7 @@ def test_disabled_raw_model_authentication(self, patched_remove_raw_authenticati
         )
 
     @pytest.mark.smoke
-    @pytest.mark.jira("RHOAIENG-52129", run=False)
+    @pytest.mark.xfail(condition=is_jira_issue_open(jira_id="RHOAIENG-52129"), reason="RHOAIENG-52129", run=False)
     def test_raw_disable_enable_authentication_no_pod_rollout(self, http_s3_ovms_raw_inference_service):
         """Verify no pod rollout when disabling and enabling authentication"""
         pod = get_pods_by_isvc_label(

utilities/jira.py

@@ -1,17 +1,22 @@
 import os
 import re
 from functools import cache
+from typing import Any
 
-from jira import JIRA
+from jira import JIRA, JIRAError
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.cluster_service_version import ClusterServiceVersion
 from ocp_resources.exceptions import MissingResourceError
 from packaging.version import Version
 from pytest_testconfig import config as py_config
+from requests.exceptions import ConnectionError as RequestsConnectionError
 from simple_logger.logger import get_logger
+from urllib3.exceptions import NewConnectionError
 
 LOGGER = get_logger(name=__name__)
 
+JIRA_CLOSED_STATUSES = ("closed", "resolved", "testing")
+
 
 @cache
 def get_jira_connection() -> JIRA:
@@ -28,6 +33,20 @@ def get_jira_connection() -> JIRA:
     )
 
 
+@cache
+def get_jira_issue_fields(jira_id: str) -> Any:
+    """
+    Get Jira issue fields (status and fixVersions).
+
+    Args:
+        jira_id: Jira issue id (e.g. "RHOAIENG-52129").
+
+    Returns:
+        Jira issue fields object with status and fixVersions.
+    """
+    return get_jira_connection().issue(id=jira_id, fields="status, fixVersions").fields
+
+
 def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
     """
     Check if Jira issue is open.
@@ -40,15 +59,11 @@ def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
         bool: True if Jira issue is open.
 
     """
-    jira_fields = get_jira_connection().issue(id=jira_id, fields="status, fixVersions").fields
-
-    jira_status = jira_fields.status.name.lower()
-
-    if jira_status not in ("testing", "resolved", "closed"):
-        LOGGER.info(f"Jira {jira_id}: status is {jira_status}")
+    if is_jira_issue_open(jira_id=jira_id):
         return True
 
     else:
+        jira_fields = get_jira_issue_fields(jira_id=jira_id)
         # Check if the operator version in ClusterServiceVersion is greater than the jira fix version
         jira_fix_versions: list[Version] = [
             Version(_fix_version.group())
@@ -57,7 +72,7 @@ def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
         ]
 
         if not jira_fix_versions:
-            raise ValueError(f"Jira {jira_id}: status is {jira_status} but does not have fix version(s)")
+            raise ValueError(f"Jira {jira_id}: closed/resolved but does not have fix version(s)")
 
         operator_version: str = ""
         for csv in ClusterServiceVersion.get(client=admin_client, namespace=py_config["applications_namespace"]):
@@ -71,9 +86,31 @@ def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
         csv_version = Version(version=operator_version)
         if all(csv_version < fix_version for fix_version in jira_fix_versions):
             LOGGER.info(
-                f"Bug is open: Jira {jira_id}: status is {jira_status}, "
-                f"fix versions {jira_fix_versions}, operator version is {operator_version}"
+                f"Bug is open: Jira {jira_id}: fix versions {jira_fix_versions}, operator version is {operator_version}"
             )
             return True
 
     return False
+
+
+@cache
+def is_jira_issue_open(jira_id: str) -> bool:  # skip-unused-code
+    """
+    Check if a Jira issue is open based on its status.
+
+    Args:
+        jira_id: Jira issue id (e.g. "RHOAIENG-52129").
+
+    Returns:
+        True if the issue status is not in closed/resolved/testing.
+        True if Jira is unreachable (assumes issue is open).
+    """
+    try:
+        jira_status = get_jira_issue_fields(jira_id=jira_id).status.name.lower()
+    except NewConnectionError, JIRAError, RequestsConnectionError:
+        LOGGER.warning(f"Failed to get Jira issue {jira_id}, assuming it is open")
+        return True
+
+    is_open = jira_status not in JIRA_CLOSED_STATUSES
+    LOGGER.info(f"Jira {jira_id}: status={jira_status}, open={is_open}")
+    return is_open