Merge pull request #998 from NHSDigital/separate-jira-integration

Separate jira integration

Author: chinmaymudholkar1

.env.generic

@@ -23,7 +23,9 @@ ADDITIONAL_FEATURE_FLAGS=
 
 SCREENSHOT_ALL_STEPS=false
 
-# JIRA Integration
+# JIRA Integration (provided by pytest-jira-zephyr-reporter package)
+# Package repository: https://github.com/NHSDigital/pytest-jira-zephyr-reporter
+# All environment variables below are optional; if not configured, tests run without Jira reporting
 JIRA_INTEGRATION_ENABLED=false
 JIRA_REPORTING_URL=https://pathtolive-jira.digital.nhs.uk
 JIRA_API_TOKEN=

.github/workflows/end-to-end-tests-release.yaml

@@ -276,6 +276,8 @@ jobs:
           IMMS_API_KID: ${{ secrets.IMMS_API_KID }}
           IMMS_API_PEM: ${{ secrets.IMMS_API_PEM }}
           # JIRA Integration Environment Variables
+          # Provided by pytest-jira-zephyr-reporter package
+          # Package: https://github.com/NHSDigital/pytest-jira-zephyr-reporter
           JIRA_INTEGRATION_ENABLED: ${{ vars.JIRA_INTEGRATION_ENABLED }}
           JIRA_REPORTING_URL: ${{ vars.JIRA_REPORTING_URL }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}

mavis/test/__init__.py

@@ -43,12 +43,23 @@
     year_groups,
 )
 from .hooks import pytest_sessionfinish, pytest_sessionstart
-from .jira_integration.hooks import (
-    pytest_configure,
-    pytest_runtest_makereport,
-    pytest_runtest_setup,
-    pytest_runtest_teardown,
-)
+
+# Note: Jira integration hooks are now provided by pytest-jira-zephyr-reporter package
+# and auto-register via pytest entry points.
+# Explicit imports below for backwards compatibility.
+try:
+    from pytest_jira_zephyr_reporter.hooks import (
+        pytest_configure,
+        pytest_runtest_makereport,
+        pytest_runtest_setup,
+        pytest_runtest_teardown,
+    )
+except ImportError:
+    # If package is not installed, define no-op hooks
+    pytest_configure = None
+    pytest_runtest_makereport = None
+    pytest_runtest_setup = None
+    pytest_runtest_teardown = None
 
 __all__ = [
     "add_vaccine_batch",

mavis/test/hooks.py

@@ -4,9 +4,19 @@
 from _pytest.main import Session
 from _pytest.reports import TestReport
 
-from mavis.test.jira_integration.hooks import pytest_sessionfinish as jira_sessionfinish
 from mavis.test.utils import get_current_datetime
 
+# Import from external package
+try:
+    from pytest_jira_zephyr_reporter.hooks import (
+        pytest_sessionfinish as jira_sessionfinish,
+    )
+except ImportError:
+    # If package not installed, use no-op function
+    def jira_sessionfinish(session: Session, exitstatus: int) -> None:
+        pass
+
+
 path = Path("logs") / "report.log"