diff --git a/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot b/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot index 3d45a65c3..d45932a31 100644 --- a/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot +++ b/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot @@ -30,10 +30,10 @@ ${KFNBC_MODAL_CLOSE_XPATH} = ${KFNBC_MODAL_HEADER_XPATH}//button[.="Close"] ${KFNBC_MODAL_X_XPATH} = ${KFNBC_MODAL_HEADER_XPATH}//button[@aria-label="Close"] ${KFNBC_CONTROL_PANEL_HEADER_XPATH} = //h1[.="Notebook server control panel"] ${KFNBC_ENV_VAR_NAME_PRE} = //span[.="Variable name"]/../../../div[@class="pf-v5-c-form__group-control"] -${DEFAULT_PYTHON_VER} = 3.9 +${DEFAULT_PYTHON_VER} = 3.11 ${PREVIOUS_PYTHON_VER} = 3.9 -${DEFAULT_NOTEBOOK_VER} = 2024.1 -${PREVIOUS_NOTEBOOK_VER} = 2023.2 +${DEFAULT_NOTEBOOK_VER} = 2024.2 +${PREVIOUS_NOTEBOOK_VER} = 2024.1 *** Keywords *** @@ -78,6 +78,26 @@ Select Notebook Image END END + IF "${version}"=="default" + # 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 + [Documentation] Replace current selectors with JupyterLab 3-specific ones. + ... This is the custom implementation since the original one doesn't really + ... reverts defaults if they had been set to Jupyter 4 in the past already. + Set Global Variable ${CM VERSION} ${5} + Set Global Variable ${CM CSS EDITOR} .CodeMirror + Set Global Variable ${CM JS INSTANCE} .CodeMirror + Set Global Variable ${JLAB CSS ACTIVE INPUT} ${JLAB CSS ACTIVE CELL} ${CM CSS EDITOR} + Log JupyterLab 3 is now the current version. + Verify Version Dropdown Is Present [Documentation] Validates the version dropdown for a given Notebook image [Arguments] ${notebook_image} @@ -355,11 +375,6 @@ Spawn Notebook With Arguments # robocop: disable ${authorization_required} = Is Service Account Authorization Required IF ${authorization_required} Authorize jupyterhub service account - # For Jupyter 4, we need to update global default variable values (images 2024b and newer) - # This calls method from JupyterLibrary Version.resource module - # TODO - shall be uncommented once the 2024b images will land into the product - # IF "${version}"=="default" Update Globals For JupyterLab 4 - Wait Notebook To Be Loaded ${image} ${version} ${spawn_fail} = Has Spawn Failed Exit For Loop If ${spawn_fail} == False diff --git a/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot b/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot index da42aaf5c..d4b81d47b 100644 --- a/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot +++ b/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot @@ -62,12 +62,11 @@ Can Spawn Notebook Remove Spawner Environment Variable env_four Remove Spawner Environment Variable env_five Remove Spawner Environment Variable env_six - ${version-check}= Is RHODS Version Greater Or Equal Than 1.18.0 - IF ${version-check}==True - FOR ${env_var} IN @{UNSUPPORTED_VAR_NAMES} - Verify Unsupported Environment Variable Is Not Allowed ${env_var} - END + + FOR ${env_var} IN @{UNSUPPORTED_VAR_NAMES} + Verify Unsupported Environment Variable Is Not Allowed ${env_var} END + # TODO: Verify why error isn't appearing within 1 minute # Verify Notebook Spawner Modal Does Not Get Stuck When Requesting Too Many Resources To Spawn Server Spawn Notebook same_tab=${False} @@ -82,7 +81,7 @@ Can Spawn Notebook Maybe Close Popup ${is_launcher_selected} = Run Keyword And Return Status JupyterLab Launcher Tab Is Selected IF not ${is_launcher_selected} Open JupyterLab Launcher - Launch a new JupyterLab Document kernel=Python 3.9 + Launch a new JupyterLab Document kernel=Python 3.11 Close Other JupyterLab Tabs *** Keywords *** diff --git a/ods_ci/tests/Tests/0500__ide/0502__ide_elyra.robot b/ods_ci/tests/Tests/0500__ide/0502__ide_elyra.robot index f342de06a..a400c105a 100644 --- a/ods_ci/tests/Tests/0500__ide/0502__ide_elyra.robot +++ b/ods_ci/tests/Tests/0500__ide/0502__ide_elyra.robot @@ -44,7 +44,7 @@ Verify Pipelines Integration With Elyra When Using Standard Data Science Image [Timeout] 10m Verify Pipelines Integration With Elyra Running Hello World Pipeline Test ... img=Standard Data Science - ... runtime_image=Datascience with Python 3.9 (UBI9) + ... runtime_image=Datascience with Python 3.11 (UBI9) ... experiment_name=standard data science pipeline Verify Pipelines Integration With Elyra When Using Standard Data Science Based Images @@ -55,10 +55,9 @@ Verify Pipelines Integration With Elyra When Using Standard Data Science Based I [Template] Verify Pipelines Integration With Elyra Running Hello World Pipeline Test [Tags] Tier1 ODS-2271 [Timeout] 30m - PyTorch Datascience with Python 3.9 (UBI9) pytorch pipeline - TensorFlow Datascience with Python 3.9 (UBI9) tensorflow pipeline - TrustyAI Datascience with Python 3.9 (UBI9) trustyai pipeline - HabanaAI Datascience with Python 3.8 (UBI8) habanaai pipeline + PyTorch Datascience with Python 3.11 (UBI9) pytorch pipeline + TensorFlow Datascience with Python 3.11 (UBI9) tensorflow pipeline + TrustyAI Datascience with Python 3.11 (UBI9) trustyai pipeline *** Keywords ***