From 96d1b31f0a4e5eed800fc15d44b5c28d4e43620c Mon Sep 17 00:00:00 2001 From: Harshad Reddy Nalla Date: Sat, 5 Oct 2024 03:47:20 -0400 Subject: [PATCH] Fix the validation ci check with latest changes Signed-off-by: Harshad Reddy Nalla --- ci/check-params-env.sh | 81 ++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/ci/check-params-env.sh b/ci/check-params-env.sh index 711d9fa46..3df337da1 100755 --- a/ci/check-params-env.sh +++ b/ci/check-params-env.sh @@ -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" ;; *)