Skip to content

Commit

Permalink
Merge pull request #737 from harshad16/fix-ci
Browse files Browse the repository at this point in the history 
Fix the validation ci check with latest changes
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Oct 5, 2024
2 parents 13dbeb3 + 96d1b31 commit d3a5f84
Showing 1 changed file with 39 additions and 42 deletions.
81 changes: 39 additions & 42 deletions ci/check-params-env.sh
View file
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

0 comments on commit d3a5f84

Please sign in to comment.