From b8ee83df060d22f37fcf55358e1c23d6b8348e12 Mon Sep 17 00:00:00 2001 From: Jan Stourac Date: Tue, 8 Oct 2024 14:07:11 +0200 Subject: [PATCH] Fix the workbench start for the Jupyter 4 (images 2024.2) --- .../Page/ODH/JupyterHub/JupyterHubSpawner.robot | 8 ++++---- .../ODHDataScienceProject/Workbenches.resource | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot b/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot index d45932a31..58994bdac 100644 --- a/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot +++ b/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot @@ -78,14 +78,14 @@ Select Notebook Image END END - IF "${version}"=="default" + IF "${version}"=="previous" + # Let's reset the JupyterLibrary settings so that global variables for Jupyter 3 (default) are in place. + Update Globals For JupyterLab 3 Custom + ELSE # For Jupyter 4, we need to update global default variable values (images 2024b and newer) # This calls method from JupyterLibrary Version.resource module # https://github.com/robots-from-jupyter/robotframework-jupyterlibrary/blob/9e25fcb89a5f1a723c59e9b96706e4c638e0d9be/src/JupyterLibrary/clients/jupyterlab/Version.resource Update Globals For JupyterLab 4 - ELSE - # Let's reset the JupyterLibrary settings so that global variables for Jupyter 3 (default) are in place. - Update Globals For JupyterLab 3 Custom END Update Globals For JupyterLab 3 Custom diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource index cd7c6ddb8..55cb744cc 100644 --- a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource +++ b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource @@ -222,6 +222,16 @@ Select Workbench Jupyter Image END END + IF "${version}"=="previous" + # Let's reset the JupyterLibrary settings so that global variables for Jupyter 3 (default) are in place. + Update Globals For JupyterLab 3 Custom + ELSE + # For Jupyter 4, we need to update global default variable values (images 2024b and newer) + # This calls method from JupyterLibrary Version.resource module + # https://github.com/robots-from-jupyter/robotframework-jupyterlibrary/blob/9e25fcb89a5f1a723c59e9b96706e4c638e0d9be/src/JupyterLibrary/clients/jupyterlab/Version.resource + Update Globals For JupyterLab 4 + END + Verify Version Selection Dropdown [Documentation] Verifies the version selection dropdown is present ... uses the recommended image by default, and has two options