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

Fix the validation ci check with latest changes #737

Merged
merged 1 commit into from
Oct 5, 2024
Merged

Fix the validation ci check with latest changes #737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 39 additions & 42 deletions ci/check-params-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,114 +91,111 @@ function check_image_variable_matches_name_and_commitref() {
local expected_build_name # Why some of the images has `-amd64` suffix and others not?
case "${image_variable}" in
odh-minimal-notebook-image-n)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="2024a"
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
expected_commitref="2024b"
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
;;
odh-minimal-notebook-image-n-1)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-minimal-gpu-notebook-image-n)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="2024a"
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
expected_commitref="2024b"
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.11-amd64"
;;
odh-minimal-gpu-notebook-image-n-1)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-pytorch-gpu-notebook-image-n)
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
expected_commitref="2024a"
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.11"
expected_commitref="2024b"
expected_build_name="jupyter-pytorch-ubi9-python-3.11-amd64"
;;
odh-pytorch-gpu-notebook-image-n-1)
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
;;
odh-generic-data-science-notebook-image-n)
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
expected_commitref="2024a"
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
expected_commitref="2024b"
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
;;
odh-generic-data-science-notebook-image-n-1)
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
;;
odh-tensorflow-gpu-notebook-image-n)
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
expected_commitref="2024a"
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
expected_commitref="2024b"
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.11-amd64"
;;
odh-tensorflow-gpu-notebook-image-n-1)
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
;;
odh-trustyai-notebook-image-n)
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
expected_commitref="2024a"
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
expected_commitref="2024b"
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
;;
odh-trustyai-notebook-image-n-1)
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
;;
odh-codeserver-notebook-image-n)
expected_name="odh-notebook-code-server-ubi9-python-3.9"
expected_commitref="2024a"
expected_build_name="codeserver-ubi9-python-3.9-amd64"
expected_name="odh-notebook-code-server-ubi9-python-3.11"
expected_commitref="2024b"
expected_build_name="codeserver-ubi9-python-3.11-amd64"
;;
odh-codeserver-notebook-image-n-1)
expected_name="odh-notebook-code-server-ubi9-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="codeserver-ubi9-python-3.9-amd64"
;;
odh-rstudio-notebook-image-n)
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
expected_commitref="2024a"
expected_build_name="rstudio-c9s-python-3.9-amd64"
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
expected_commitref="2024b"
expected_build_name="rstudio-c9s-python-3.11-amd64"
;;
odh-rstudio-notebook-image-n-1)
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="rstudio-c9s-python-3.9-amd64"
;;
# For both RStudio GPU workbenches - the final name labels are identical to plain RStudio ones
# This is because the very same RStudio Dockerfile is used but different base images in both cases
# We should consider what to do with this - in ideal case, we should have different labels for these cases.
odh-rstudio-gpu-notebook-image-n)
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
expected_commitref="2024a"
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
expected_commitref="2024b"
expected_build_name="cuda-rstudio-c9s-python-3.11-amd64"
;;
odh-rstudio-gpu-notebook-image-n-1)
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
expected_commitref="2023b"
expected_commitref="2024a"
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
;;
odh-rocm-minimal-notebook-image-n)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
expected_commitref="main"
# expected_commitref="2024b"
expected_commitref="2024b"
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
;;
odh-rocm-pytorch-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
expected_commitref="main"
# expected_commitref="2024b"
expected_commitref="2024b"
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
;;
odh-rocm-tensorflow-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
expected_commitref="main"
# expected_commitref="2024b"
expected_commitref="2024b"
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"
;;
*)
Expand Down