refactor: improve architecture detection and feature support handling in tests

Signed-off-by: Nishan Acharya <[email protected]>

Author: Nash-123

tests/containers/architecture_support.py

@@ -0,0 +1,28 @@
+"""Centralized configuration for architecture-specific feature limitations."""
+
+ARCHITECTURE_LIMITATIONS = {
+    "s390x": {
+        "pdf_export": False,
+        "pdf_export_reason": "TexLive and Pandoc dependencies not available on s390x"
+    },
+    "x86_64": {
+        "pdf_export": True,
+        "pdf_export_reason": "Full support available"
+    },
+    "aarch64": {
+        "pdf_export": True,
+        "pdf_export_reason": "Full support available"
+    },
+    "ppc64le": {
+        "pdf_export": True,
+        "pdf_export_reason": "Full support available"
+    }
+}
+
+# Architecture mapping from uname -m to common names
+ARCHITECTURE_NAMES = {
+    "x86_64": "x86_64",
+    "aarch64": "arm64",
+    "ppc64le": "ppc64le",
+    "s390x": "s390x"
+}

tests/containers/architecture_utils.py

@@ -0,0 +1,27 @@
+"""Architecture detection utilities for container tests."""
+
+import pytest
+from tests.containers import docker_utils
+from tests.containers.workbenches.workbench_image_test import WorkbenchContainer
+from tests.containers.architecture_support import ARCHITECTURE_LIMITATIONS
+
+@pytest.fixture(scope="function")
+def container_architecture(jupyterlab_image):
+    """Cache architecture detection per test function."""
+    container = WorkbenchContainer(image=jupyterlab_image.name, user=4321, group_add=[0])
+    container.start(wait_for_readiness=False)
+    try:
+        exit_code, arch_output = container.exec(["uname", "-m"])
+        if exit_code == 0:
+            return arch_output.decode().strip()
+        return None
+    finally:
+        docker_utils.NotebookContainer(container).stop(timeout=0)
+
+def is_feature_supported(architecture: str, feature: str) -> bool:
+    """Check if a feature is supported on the given architecture."""
+    return ARCHITECTURE_LIMITATIONS.get(architecture, {}).get(feature, True)
+
+def get_architecture_limitation_reason(architecture: str, feature: str) -> str:
+    """Get the reason why a feature is not supported on the given architecture."""
+    return ARCHITECTURE_LIMITATIONS.get(architecture, {}).get(f"{feature}_reason", "Unknown limitation")

tests/containers/workbenches/jupyterlab/jupyterlab_test.py

@@ -9,7 +9,7 @@
 
 from tests.containers import conftest, docker_utils
 from tests.containers.workbenches.workbench_image_test import WorkbenchContainer
-
+from tests.containers.architecture_utils import (is_feature_supported, get_architecture_limitation_reason, container_architecture)
 
 class TestJupyterLabImage:
     """Tests for JupyterLab Workbench images in this repository."""
@@ -56,16 +56,12 @@ def test_spinner_html_loaded(self, jupyterlab_image: conftest.Image) -> None:
 
     @allure.issue("RHOAIENG-16568")
     @allure.description("Check that PDF export is working correctly")
-    def test_pdf_export(self, jupyterlab_image: conftest.Image) -> None:
+    def test_pdf_export(self, jupyterlab_image: conftest.Image, container_architecture) -> None:
+        # Skip if PDF export is not supported on this architecture
+        if not is_feature_supported(container_architecture,"pdf_export"):
+            reason = get_architecture_limitation_reason(container_architecture, "pdf_export")
+            pytest.skip(f"PDF export functionality is not supported on {container_architecture} architecture: {reason}")
         container = WorkbenchContainer(image=jupyterlab_image.name, user=4321, group_add=[0])
-        # Skip if we're running on s390x architecture
-        container.start(wait_for_readiness=False)
-        try:
-            exit_code, arch_output = container.exec(["uname", "-m"])
-            if exit_code == 0 and arch_output.decode().strip() == "s390x":
-                pytest.skip("PDF export functionality is not supported on s390x architecture")
-        finally:
-            docker_utils.NotebookContainer(container).stop(timeout=0)
         test_file_name = "test.ipybn"
         test_file_content = """{
                 "cells": [