Fix python version fetching

Signed-off-by: lugi0 <[email protected]>
lugi0 · Oct 8, 2024 · d06340a · d06340a
1 parent eba9798
commit d06340a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterLabLauncher.robot b/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterLabLauncher.robot
@@ -145,7 +145,9 @@ Get XY Python Version From Jupyterlab
     [Documentation]    Fetches the X.Y Python version from the current Jupyterlab instance
     ${output}=    Run Cell And Get Output    !python --version
     ${output}=    Fetch From Right    ${output}    ${SPACE}
-    ${vers}=    Get Substring    ${output}    0    3
+    # Y and Z can be > len 1, split on "." instead of getting substring from indices
+    @{split_out}=    Split String    ${output}   separator=.
+    ${vers}=    Set Variable   ${split_out}[0].${split_out}[1]
     RETURN    ${vers}
 
 Maybe Select Kernel

diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource
@@ -215,8 +215,10 @@ Select Workbench Jupyter Image
     IF    "${version}" != "${NONE}"
         IF    "${version}"=="default"
             Verify Version Selection Dropdown
+            Update Globals For JupyterLab 4
         ELSE IF    "${version}"=="previous"
             Select Workbench Image Version    ${version}
+            Update Globals For JupyterLab 3 Custom
         ELSE
             Fail    ${version} does not exist, use default/previous
         END

diff --git a/ods_ci/tests/Tests/1300__model_registry/1301_model_registry_model_serving.robot b/ods_ci/tests/Tests/1300__model_registry/1301_model_registry_model_serving.robot
@@ -71,8 +71,6 @@ Verify Model Registry Integration With Secured-DB
     ...         workbench_namespace=${PRJ_TITLE}
     Upload File In The Workbench     filepath=${JUPYTER_NOTEBOOK_FILEPATH}    workbench_title=${WORKBENCH_TITLE}
     ...         workbench_namespace=${PRJ_TITLE}
-    # In the latest minimal python image these dependencies are not found by pip even though the UI shows them to be 
-    # present. Switch to installing model registry from pip directly.
     Download Python Client Dependencies    ${MR_PYTHON_CLIENT_FILES}    ${MR_PYTHON_CLIENT_WHL_VERSION}
     Upload Python Client Files In The Workbench    ${MR_PYTHON_CLIENT_FILES}
     Upload Certificate To Jupyter Notebook    ${CERTS_DIRECTORY}/domain.crt