Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the Python version and other requirements for the 2024b OOTB images #1870

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Update the Python version and other requirements for the 2024b OOTB images #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f510ba
Update the Python version and other requirements for the 2024b OOTB i…
jstourac Sep 30, 2024
131f6f3
Remove Habana image test as Habana image was removed in 2.14
jstourac Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
${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 ***
Expand Down Expand Up @@ -78,6 +78,26 @@
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}

Check notice

Code scanning / Robocop

{{ set_variable_keyword }} can be replaced with VAR Note test

Set Global Variable can be replaced with VAR
Set Global Variable ${CM CSS EDITOR} .CodeMirror

Check notice

Code scanning / Robocop

{{ set_variable_keyword }} can be replaced with VAR Note test

Set Global Variable can be replaced with VAR
Set Global Variable ${CM JS INSTANCE} .CodeMirror

Check notice

Code scanning / Robocop

{{ set_variable_keyword }} can be replaced with VAR Note test

Set Global Variable can be replaced with VAR
Set Global Variable ${JLAB CSS ACTIVE INPUT} ${JLAB CSS ACTIVE CELL} ${CM CSS EDITOR}

Check notice

Code scanning / Robocop

{{ set_variable_keyword }} can be replaced with VAR Note test

Set Global Variable can be replaced with VAR
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}
Expand Down Expand Up @@ -355,11 +375,6 @@
${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
Expand Down
11 changes: 5 additions & 6 deletions ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,11 @@
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}
Expand All @@ -82,7 +81,7 @@
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

Check warning

Code scanning / Robocop

Keyword name '{{ keyword_name }}' does not follow case convention Warning test

Keyword name 'Launch a new JupyterLab Document' does not follow case convention
Close Other JupyterLab Tabs

*** Keywords ***
Expand Down
9 changes: 4 additions & 5 deletions ods_ci/tests/Tests/0500__ide/0502__ide_elyra.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
bdattoma marked this conversation as resolved.
Show resolved Hide resolved
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 ***
Expand Down
Loading