Merge pull request #2541 from atheo89/update-new-rstudio

RHAIENG-1022: upgrade RStudio c9s and rhel

Author: atheo89

.tekton/odh-workbench-rstudio-minimal-cpu-py311-c9s-pull-request.yaml

@@ -410,11 +410,7 @@ validate-rstudio-image: bin/kubectl
 # Default Python version
 PYTHON_VERSION ?= 3.12
 ROOT_DIR := $(shell pwd)
-ifeq ($(PYTHON_VERSION), 3.11)
-	BASE_DIRS := \
-		rstudio/rhel9-python-$(PYTHON_VERSION) \
-		rstudio/c9s-python-$(PYTHON_VERSION)
-else ifeq ($(PYTHON_VERSION), 3.12)
+ifeq ($(PYTHON_VERSION), 3.12)
 	BASE_DIRS := \
 	    jupyter/minimal/ubi9-python-$(PYTHON_VERSION) \
 		jupyter/datascience/ubi9-python-$(PYTHON_VERSION) \
@@ -431,9 +427,9 @@ else ifeq ($(PYTHON_VERSION), 3.12)
 		runtimes/rocm-pytorch/ubi9-python-$(PYTHON_VERSION) \
 		runtimes/pytorch+llmcompressor/ubi9-python-$(PYTHON_VERSION) \
 		runtimes/rocm-tensorflow/ubi9-python-$(PYTHON_VERSION) \
-		jupyter/rocm/tensorflow/ubi9-python-$(PYTHON_VERSION)
-		# rstudio/rhel9-python-$(PYTHON_VERSION)
-		# rstudio/c9s-python-$(PYTHON_VERSION)
+		jupyter/rocm/tensorflow/ubi9-python-$(PYTHON_VERSION) \
+		rstudio/rhel9-python-$(PYTHON_VERSION) \
+		rstudio/c9s-python-$(PYTHON_VERSION)
 else
 	$(error Invalid Python version $(PYTHON_VERSION))
 endif
@@ -483,13 +479,7 @@ scan-image-vulnerabilities:
 
 # This is used primarily for gen_gha_matrix_jobs.py to we know the set of all possible images we may want to build
 .PHONY: all-images
-ifeq ($(RELEASE_PYTHON_VERSION), 3.11)
-all-images: \
-	rstudio-c9s-python-$(RELEASE_PYTHON_VERSION) \
-	rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION) \
-	cuda-rstudio-c9s-python-$(RELEASE_PYTHON_VERSION) \
-	cuda-rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION)
-else ifeq ($(RELEASE_PYTHON_VERSION), 3.12)
+ifeq ($(RELEASE_PYTHON_VERSION), 3.12)
 all-images: \
 	jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
 	jupyter-datascience-ubi9-python-$(RELEASE_PYTHON_VERSION) \
@@ -508,12 +498,11 @@ all-images: \
  	rocm-jupyter-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
 	rocm-runtime-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
 	rocm-runtime-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
-	rocm-jupyter-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION)
-# rstudio-c9s-python-$(RELEASE_PYTHON_VERSION)
-# cuda-rstudio-c9s-python-$(RELEASE_PYTHON_VERSION)
-# rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION)
-# cuda-rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION)
-
+	rocm-jupyter-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
+	rstudio-c9s-python-$(RELEASE_PYTHON_VERSION) \
+	cuda-rstudio-c9s-python-$(RELEASE_PYTHON_VERSION) \
+	rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION) \
+	cuda-rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION)
 else
 	$(error Invalid Python version $(RELEASE_PYTHON_VERSION))
 endif

.tekton/odh-workbench-rstudio-minimal-cpu-py311-c9s-push.yaml

@@ -22,9 +22,7 @@
 project_dir = pathlib.Path(__file__).parent.parent.parent.absolute()
 
 ARM64_COMPATIBLE = {
-    "codeserver-ubi9-python-3.11",
     "codeserver-ubi9-python-3.12",
-    "cuda-jupyter-minimal-ubi9-python-3.11",
     "cuda-jupyter-minimal-ubi9-python-3.12",
     "cuda-jupyter-tensorflow-ubi9-python-3.12",
     "runtime-cuda-tensorflow-ubi9-python-3.12",
@@ -36,11 +34,8 @@
 }
 
 S390X_COMPATIBLE = {
-    "runtime-minimal-ubi9-python-3.11",
     "runtime-minimal-ubi9-python-3.12",
-    "jupyter-minimal-ubi9-python-3.11",
     "jupyter-minimal-ubi9-python-3.12",
-    "runtime-datascience-ubi9-python-3.11",
     "runtime-datascience-ubi9-python-3.12",
     # add more here
 }
@@ -141,9 +136,7 @@ def main() -> None:
     )
     args = argparser.parse_args()
 
-    targets = extract_image_targets(env={"RELEASE_PYTHON_VERSION": "3.11"}) + extract_image_targets(
-        env={"RELEASE_PYTHON_VERSION": "3.12"}
-    )
+    targets = extract_image_targets(env={"RELEASE_PYTHON_VERSION": "3.12"})
 
     if args.from_ref:
         logging.info("Skipping targets not modified in the PR")
@@ -182,11 +175,7 @@ def main() -> None:
                 "include": [
                     {
                         "target": target,
-                        "python": "3.11"
-                        if "-python-3.11" in target
-                        else "3.12"
-                        if "-python-3.12" in target
-                        else "invalid-python-version",
+                        "python": "3.12",
                         "platform": platform,
                         "subscription": "rhel" in target,
                     }
@@ -217,28 +206,23 @@ class SelfTests(unittest.TestCase):
     def test_select_changed_targets_dockerfile(self):
         targets = extract_image_targets(makefile_dir=project_dir)
 
-        changed_files = ["jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu"]
+        changed_files = ["jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu"]
 
         targets = gha_pr_changed_files.filter_out_unchanged(targets, changed_files)
-        assert set(targets) == {"jupyter-datascience-ubi9-python-3.11"}
+        assert set(targets) == {"jupyter-datascience-ubi9-python-3.12"}
 
     def test_select_changed_targets_shared_file(self):
         targets = extract_image_targets(makefile_dir=project_dir)
 
-        changed_files = ["cuda/ubi9-python-3.11/NGC-DL-CONTAINER-LICENSE"]
+        changed_files = ["cuda/ubi9-python-3.12/NGC-DL-CONTAINER-LICENSE"]
 
-        # With the removal of chained builds - which now potentially has multiple Dockerfiles defined in a given
-        # directory, there is an inefficiency introduced to 'gha_pr_changed_files' as demonstrated by this unit test.
-        # Even though this test only changes a (shared) CUDA file - you will notice the 'cpu' and 'rocm' targets
-        # also being returned.  Odds of this inefficiency noticably "hurting us" is low - so of the opinion we can
-        # simply treat this as technical debt.
         targets = gha_pr_changed_files.filter_out_unchanged(targets, changed_files)
         assert set(targets) == {
-            "jupyter-minimal-ubi9-python-3.11",
-            "cuda-jupyter-minimal-ubi9-python-3.11",
-            "cuda-jupyter-pytorch-ubi9-python-3.11",
-            "runtime-cuda-pytorch-ubi9-python-3.11",
-            "cuda-jupyter-tensorflow-ubi9-python-3.11",
-            "rocm-jupyter-minimal-ubi9-python-3.11",
-            "runtime-cuda-tensorflow-ubi9-python-3.11",
+            "jupyter-minimal-ubi9-python-3.12",
+            "cuda-jupyter-minimal-ubi9-python-3.12",
+            "cuda-jupyter-pytorch-ubi9-python-3.12",
+            "runtime-cuda-pytorch-ubi9-python-3.12",
+            "cuda-jupyter-tensorflow-ubi9-python-3.12",
+            "rocm-jupyter-minimal-ubi9-python-3.12",
+            "runtime-cuda-tensorflow-ubi9-python-3.12",
         }