RHOAIENG-25226: Standardize the image name with image convention

.github/workflows/params-env.yaml

@@ -6,9 +6,9 @@ on:  # yamllint disable-line rule:truthy
     paths:
       - 'manifests/base/commit.env'
       - 'manifests/base/params.env'
+      - 'manifests/base/commit-latest.env'
+      - 'manifests/base/params-latest.env'
       - 'ci/check-params-env.sh'
-      - 'ci/check-runtime-images.sh'
-      - 'manifests/base/runtime-*-imagestream.yaml'
   workflow_dispatch:
 
 permissions:
@@ -28,7 +28,3 @@ jobs:
         run: |
           bash ./ci/check-params-env.sh
 
-      - name: Validate references for runtime images
-        id: validate-runtime-images-references
-        run: |
-          bash ./ci/check-runtime-images.sh

ci/check-software-versions.py

@@ -22,6 +22,7 @@
 import yaml
 
 # Path to the file with image references to the image registry
+PARAMS_LATEST_ENV_PATH = "manifests/base/params-latest.env"
 PARAMS_ENV_PATH = "manifests/base/params.env"
 
 
@@ -64,16 +65,20 @@ def load_yaml(filepath):
 
 
 def extract_variable(reference):
-    """Extracts a variable name from a string (e.g.: 'odh-rstudio-notebook-image-commit-n-1_PLACEHOLDER') using regex."""
+    """Extracts a variable name from a string (e.g.: 'odh-workbench-rstudio-minimal-cpu-py311-c9s-commit-n-1_PLACEHOLDER') using regex."""
 
     return reference.replace("_PLACEHOLDER", "")
 
 
-def get_variable_value(variable_name, params_file_path=PARAMS_ENV_PATH):
+def get_variable_value(variable_name, params_file_path=[PARAMS_LATEST_ENV_PATH, PARAMS_ENV_PATH]):
     """Retrieves the value of a variable from a parameters file."""
 
     try:
-        with open(params_file_path, "r") as params_file:
+        with open(params_file_path[0], "r") as params_file:
+            for line in params_file:
+                if variable_name in line:
+                    return line.split("=")[1].strip()
+        with open(params_file_path[1], "r") as params_file:
             for line in params_file:
                 if variable_name in line:
                     return line.split("=")[1].strip()

ci/package_versions_selftestdata.py

@@ -30,10 +30,10 @@
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/default-image: "true"
-        opendatahub.io/notebook-build-commit: odh-minimal-notebook-image-commit-n_PLACEHOLDER
+        opendatahub.io/notebook-build-commit: odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n_PLACEHOLDER
       from:
         kind: DockerImage
-        name: $(odh-minimal-notebook-image-n)
+        name: $(odh-workbench-jupyter-minimal-cpu-py311-ubi9-n)
       name: "2024.2"
       referencePolicy:
         type: Source
@@ -53,10 +53,10 @@
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'false'
         opendatahub.io/default-image: "true"
-        opendatahub.io/notebook-build-commit: odh-minimal-notebook-image-commit-n-1_PLACEHOLDER
+        opendatahub.io/notebook-build-commit: odh-workbench-jupyter-minimal-cpu-py311-ubi9-commit-n-1_PLACEHOLDER
       from:
         kind: DockerImage
-        name: $(odh-minimal-notebook-image-n-1)
+        name: $(odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-1)
       name: "2024.1"
       referencePolicy:
         type: Source

ci/security-scan/quay_security_analysis.py

@@ -26,35 +26,35 @@
 ]
 
 IMAGES = [
-    "odh-minimal-notebook-image-n",
+    "odh-workbench-jupyter-minimal-cpu-py311-ubi9-n",
     "odh-runtime-minimal-notebook-image-n",
     "odh-runtime-data-science-notebook-image-n",
-    "odh-minimal-gpu-notebook-image-n",
-    "odh-pytorch-gpu-notebook-image-n",
+    "odh-workbench-jupyter-minimal-cuda-py311-ubi9-n",
+    "odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n",
     "odh-runtime-pytorch-notebook-image-n",
-    "odh-generic-data-science-notebook-image-n",
-    "odh-tensorflow-gpu-notebook-image-n",
+    "odh-workbench-jupyter-datascience-cpu-py311-ubi9-n",
+    "odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n",
     "odh-runtime-tensorflow-notebook-image-n",
-    "odh-trustyai-notebook-image-n",
-    "odh-codeserver-notebook-image-n",
-    "odh-rstudio-notebook-image-n",
-    "odh-rstudio-gpu-notebook-image-n",
+    "odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n",
+    "odh-workbench-codeserver-datascience-cpu-py311-ubi9-n",
+    "odh-workbench-rstudio-minimal-cpu-py311-c9s-n",
+    "odh-workbench-rstudio-minimal-cuda-py311-c9s-n",
 ]
 
 IMAGES_N_1 = [
-    "odh-minimal-notebook-image-n-1",
+    "odh-workbench-jupyter-minimal-cpu-py311-ubi9-n-1",
     "odh-runtime-minimal-notebook-image-n-1",
-    "odh-minimal-gpu-notebook-image-n-1",
-    "odh-pytorch-gpu-notebook-image-n-1",
+    "odh-workbench-jupyter-minimal-cuda-py311-ubi9-n-1",
+    "odh-workbench-jupyter-pytorch-cuda-py311-ubi9-n-1",
     "odh-runtime-pytorch-notebook-image-n-1",
     "odh-runtime-data-science-notebook-image-n-1",
-    "odh-generic-data-science-notebook-image-n-1",
-    "odh-tensorflow-gpu-notebook-image-n-1",
+    "odh-workbench-jupyter-datascience-cpu-py311-ubi9-n-1",
+    "odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-n-1",
     "odh-runtime-tensorflow-notebook-image-n-1",
-    "odh-trustyai-notebook-image-n-1",
-    "odh-codeserver-notebook-image-n-1",
-    "odh-rstudio-notebook-image-n-1",
-    "odh-rstudio-gpu-notebook-image-n-1",
+    "odh-workbench-jupyter-trustyai-cpu-py311-ubi9-n-1",
+    "odh-workbench-codeserver-datascience-cpu-py311-ubi9-n-1",
+    "odh-workbench-rstudio-minimal-cpu-py311-c9s-n-1",
+    "odh-workbench-rstudio-minimal-cuda-py311-c9s-n-1",
 ]