diff --git a/ci/cached-builds/gen_gha_matrix_jobs.py b/ci/cached-builds/gen_gha_matrix_jobs.py index 218afa7f3f..4eebfa2f0a 100755 --- a/ci/cached-builds/gen_gha_matrix_jobs.py +++ b/ci/cached-builds/gen_gha_matrix_jobs.py @@ -31,6 +31,8 @@ S390X_COMPATIBLE = { "runtime-minimal-ubi9-python-3.11", "runtime-minimal-ubi9-python-3.12", + "jupyter-minimal-ubi9-python-3.11", + "jupyter-minimal-ubi9-python-3.12", # add more here } diff --git a/jupyter/utils/install_pdf_deps.sh b/jupyter/utils/install_pdf_deps.sh index 26d069207c..94cacd6204 100755 --- a/jupyter/utils/install_pdf_deps.sh +++ b/jupyter/utils/install_pdf_deps.sh @@ -17,6 +17,12 @@ if [[ -z "${ARCH:-}" ]]; then exit 1 fi +# Skip PDF export installation for s390x architecture +if [[ "${ARCH}" == "s390x" ]]; then + echo "PDF export functionality is not supported on s390x architecture. Skipping installation." + exit 0 +fi + # tex live installation echo "Installing TexLive to allow PDf export from Notebooks" curl -fL https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz -o install-tl-unx.tar.gz diff --git a/tests/containers/workbenches/jupyterlab/jupyterlab_test.py b/tests/containers/workbenches/jupyterlab/jupyterlab_test.py index dda7b5b451..8d43af2dda 100644 --- a/tests/containers/workbenches/jupyterlab/jupyterlab_test.py +++ b/tests/containers/workbenches/jupyterlab/jupyterlab_test.py @@ -58,6 +58,14 @@ def test_spinner_html_loaded(self, jupyterlab_image: conftest.Image) -> None: @allure.description("Check that PDF export is working correctly") def test_pdf_export(self, jupyterlab_image: conftest.Image) -> None: 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": [