RHOAIENG-30769: disable PDF export for s390x architecture in Jupyter Minimal images

ci/cached-builds/gen_gha_matrix_jobs.py

@@ -33,6 +33,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
 }
 

jupyter/datascience/ubi9-python-3.12/Pipfile

@@ -45,7 +45,7 @@ nbgitpuller = "~=1.2.2"
 
 # Base packages
 wheel = "~=0.45.1"
-setuptools = "~=75.8.2"
+setuptools = "~=78.1.1"
 
 [requires]
 python_version = "3.12"

jupyter/datascience/ubi9-python-3.12/requirements.txt

@@ -2739,9 +2739,9 @@ scipy==1.15.3; python_version >= '3.10' \
 send2trash==1.8.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' \
     --hash=sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9 \
     --hash=sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf
-setuptools==75.8.2; python_version >= '3.9' \
-    --hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
-    --hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
+setuptools==78.1.1; python_version >= '3.9' \
+    --hash=sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561 \
+    --hash=sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d
 simpervisor==1.0.0; python_version >= '3.8' \
     --hash=sha256:3e313318264559beea3f475ead202bc1cd58a2f1288363abb5657d306c5b8388 \
     --hash=sha256:7eb87ca86d5e276976f5bb0290975a05d452c6a7b7f58062daea7d8369c823c1

jupyter/minimal/ubi9-python-3.12/Pipfile

@@ -18,7 +18,7 @@ nbgitpuller = "~=1.2.2"
 
 # Base packages
 wheel = "~=0.45.1"
-setuptools = "~=75.8.2"
+setuptools = "~=78.1.1"
 
 [requires]
 python_version = "3.12"

jupyter/minimal/ubi9-python-3.12/requirements.txt

@@ -1228,9 +1228,9 @@ rpds-py==0.27.0; python_version >= '3.9' \
 send2trash==1.8.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' \
     --hash=sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9 \
     --hash=sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf
-setuptools==75.8.2; python_version >= '3.9' \
-    --hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
-    --hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
+setuptools==78.1.1; python_version >= '3.9' \
+    --hash=sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561 \
+    --hash=sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d
 simpervisor==1.0.0; python_version >= '3.8' \
     --hash=sha256:3e313318264559beea3f475ead202bc1cd58a2f1288363abb5657d306c5b8388 \
     --hash=sha256:7eb87ca86d5e276976f5bb0290975a05d452c6a7b7f58062daea7d8369c823c1

jupyter/pytorch+llmcompressor/ubi9-python-3.11/Pipfile

@@ -70,7 +70,7 @@ nbgitpuller = "~=1.2.2"
 
 # Base packages
 wheel = "~=0.45.1"
-setuptools = "~=75.8.2"
+setuptools = "~=78.1.1"
 
 [requires]
 python_version = "3.11"

jupyter/pytorch+llmcompressor/ubi9-python-3.11/requirements.txt

@@ -2968,9 +2968,9 @@ scipy==1.15.3; python_version >= '3.10' \
 send2trash==1.8.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' \
     --hash=sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9 \
     --hash=sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf
-setuptools==75.8.2; python_version >= '3.9' \
-    --hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
-    --hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
+setuptools==78.1.1; python_version >= '3.9' \
+    --hash=sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561 \
+    --hash=sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d
 simpervisor==1.0.0; python_version >= '3.8' \
     --hash=sha256:3e313318264559beea3f475ead202bc1cd58a2f1288363abb5657d306c5b8388 \
     --hash=sha256:7eb87ca86d5e276976f5bb0290975a05d452c6a7b7f58062daea7d8369c823c1
@@ -4118,9 +4118,9 @@ numba==0.61.2; python_version >= '3.10' \
     --hash=sha256:cf9f9fc00d6eca0c23fc840817ce9f439b9f03c8f03d6246c0e7f0cb15b7162a \
     --hash=sha256:ea0247617edcb5dd61f6106a56255baab031acc4257bddaeddb3a1003b4ca3fd \
     --hash=sha256:efd3db391df53aaa5cfbee189b6c910a5b471488749fd6606c3f33fc984c2ae2
-openai==1.99.1; python_version >= '3.8' \
-    --hash=sha256:2c9d8e498c298f51bb94bcac724257a3a6cac6139ccdfc1186c6708f7a93120f \
-    --hash=sha256:8eeccc69e0ece1357b51ca0d9fb21324afee09b20c3e5b547d02445ca18a4e03
+openai==1.99.3; python_version >= '3.8' \
+    --hash=sha256:1a0e2910e4545d828c14218f2ac3276827c94a043f5353e43b9413b38b497897 \
+    --hash=sha256:c786a03f6cddadb5ee42c6d749aa4f6134fe14fdd7d69a667e5e7ce7fd29a719
 opencv-python-headless==4.11.0.86; python_version >= '3.6' \
     --hash=sha256:0e0a27c19dd1f40ddff94976cfe43066fbbe9dfbb2ec1907d66c19caef42a57b \
     --hash=sha256:48128188ade4a7e517237c8e1e11a9cdf5c282761473383e77beb875bb1e61ca \

jupyter/pytorch/ubi9-python-3.12/Pipfile

@@ -55,7 +55,7 @@ nbgitpuller = "~=1.2.2"
 
 # Base packages
 wheel = "~=0.45.1"
-setuptools = "~=75.8.2"
+setuptools = "~=78.1.1"
 
 [requires]
 python_version = "3.12"

jupyter/pytorch/ubi9-python-3.12/requirements.txt

@@ -2813,9 +2813,9 @@ scipy==1.15.3; python_version >= '3.10' \
 send2trash==1.8.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' \
     --hash=sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9 \
     --hash=sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf
-setuptools==75.8.2; python_version >= '3.9' \
-    --hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
-    --hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
+setuptools==78.1.1; python_version >= '3.9' \
+    --hash=sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561 \
+    --hash=sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d
 simpervisor==1.0.0; python_version >= '3.8' \
     --hash=sha256:3e313318264559beea3f475ead202bc1cd58a2f1288363abb5657d306c5b8388 \
     --hash=sha256:7eb87ca86d5e276976f5bb0290975a05d452c6a7b7f58062daea7d8369c823c1

jupyter/tensorflow/ubi9-python-3.12/Pipfile

@@ -50,7 +50,7 @@ nbgitpuller = "~=1.2.2"
 
 # Base packages
 wheel = "~=0.45.1"
-setuptools = "~=75.8.2"
+setuptools = "~=78.1.1"
 
 [requires]
 python_version = "3.12"

jupyter/tensorflow/ubi9-python-3.12/requirements.txt

@@ -2955,9 +2955,9 @@ scipy==1.15.3; python_version >= '3.10' \
 send2trash==1.8.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' \
     --hash=sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9 \
     --hash=sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf
-setuptools==75.8.2; python_version >= '3.9' \
-    --hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
-    --hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
+setuptools==78.1.1; python_version >= '3.9' \
+    --hash=sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561 \
+    --hash=sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d
 simpervisor==1.0.0; python_version >= '3.8' \
     --hash=sha256:3e313318264559beea3f475ead202bc1cd58a2f1288363abb5657d306c5b8388 \
     --hash=sha256:7eb87ca86d5e276976f5bb0290975a05d452c6a7b7f58062daea7d8369c823c1

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 [[ "$(uname -m)" == "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

runtimes/pytorch+llmcompressor/ubi9-python-3.11/Pipfile

@@ -70,7 +70,7 @@ traitlets = "~=5.14.3"
 urllib3 = "~=2.3.0"
 
 # Base packages
-setuptools = "==75.8.2"
+setuptools = "~=78.1.1"
 wheel = "==0.45.1"
 
 [requires]

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": [