RHOAIENG-8388: rm(intel): Intel tensorflow notebook failed to get tes…

…ted on OCP-CI so broken intel notebooks should be deleted (#843) * RHOAIENG-8388: rm(intel): Intel tensorflow notebook failed to get tested on OCP-CI The Intel workbench images are broken in multiple ways and since we don't ship them, let's not even carry them on the books. * fixup, remove intel references from test_jupyter_with_papermill.sh
opendatahub-io · Jan 21, 2025 · c5b27af · c5b27af
1 parent b4539c0
commit c5b27af
Show file tree

Hide file tree

Showing 93 changed files with 76 additions and 47,841 deletions.
diff --git a/.github/workflows/build-notebooks-TEMPLATE.yaml b/.github/workflows/build-notebooks-TEMPLATE.yaml
@@ -62,7 +62,7 @@ jobs:
 
       - name: Free up additional disk space
         # https://docs.github.com/en/actions/learn-github-actions/expressions
-        if: "${{ contains(inputs.target, 'rocm') || contains(inputs.target, 'cuda') || contains(inputs.target, 'intel') ||
+        if: "${{ contains(inputs.target, 'rocm') || contains(inputs.target, 'cuda') ||
          contains(inputs.target, 'pytorch') || contains(inputs.target, 'tensorflow') }}"
         run: |
           set -x

diff --git a/.github/workflows/build-notebooks.yaml b/.github/workflows/build-notebooks.yaml
@@ -167,83 +167,6 @@
             },
             "secrets": "inherit"
         },
-        "intel-base-gpu-ubi9-python-3_11": {
-            "needs": [
-                "base-ubi9-python-3_11"
-            ],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": "intel-base-gpu-ubi9-python-3.11",
-                "github": "${{ toJSON(github) }}"
-            },
-            "secrets": "inherit"
-        },
-        "intel-runtime-tensorflow-ubi9-python-3_11": {
-            "needs": [
-                "intel-base-gpu-ubi9-python-3_11"
-            ],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": "intel-runtime-tensorflow-ubi9-python-3.11",
-                "github": "${{ toJSON(github) }}"
-            },
-            "secrets": "inherit"
-        },
-        "jupyter-intel-tensorflow-ubi9-python-3_11": {
-            "needs": [
-                "intel-base-gpu-ubi9-python-3_11"
-            ],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": "jupyter-intel-tensorflow-ubi9-python-3.11",
-                "github": "${{ toJSON(github) }}"
-            },
-            "secrets": "inherit"
-        },
-        "intel-runtime-pytorch-ubi9-python-3_11": {
-            "needs": [
-                "intel-base-gpu-ubi9-python-3_11"
-            ],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": "intel-runtime-pytorch-ubi9-python-3.11",
-                "github": "${{ toJSON(github) }}"
-            },
-            "secrets": "inherit"
-        },
-        "jupyter-intel-pytorch-ubi9-python-3_11": {
-            "needs": [
-                "intel-base-gpu-ubi9-python-3_11"
-            ],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": "jupyter-intel-pytorch-ubi9-python-3.11",
-                "github": "${{ toJSON(github) }}"
-            },
-            "secrets": "inherit"
-        },
-        "intel-runtime-ml-ubi9-python-3_11": {
-            "needs": [
-                "base-ubi9-python-3_11"
-            ],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": "intel-runtime-ml-ubi9-python-3.11",
-                "github": "${{ toJSON(github) }}"
-            },
-            "secrets": "inherit"
-        },
-        "jupyter-intel-ml-ubi9-python-3_11": {
-            "needs": [
-                "base-ubi9-python-3_11"
-            ],
-            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
-            "with": {
-                "target": "jupyter-intel-ml-ubi9-python-3.11",
-                "github": "${{ toJSON(github) }}"
-            },
-            "secrets": "inherit"
-        },
         "base-c9s-python-3_11": {
             "needs": [],
             "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",

diff --git a/.github/workflows/pr-merge-image-delete.yml b/.github/workflows/pr-merge-image-delete.yml
@@ -78,13 +78,6 @@ jobs:
           skopeo delete docker://${QUAY_IMAGE_REPO}:codeserver-ubi9-python-3.11-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:rstudio-c9s-python-3.11-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-rstudio-c9s-python-3.11-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:intel-base-gpu-ubi9-python-3.11-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:intel-runtime-tensorflow-ubi9-python-3.11-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:intel-runtime-pytorch-ubi9-python-3.11-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:intel-runtime-ml-ubi9-python-3.11-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-intel-tensorflow-ubi9-python-3.11-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-intel-pytorch-ubi9-python-3.11-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-intel-ml-ubi9-python-3.11-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-ubi9-python-3.11-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-minimal-ubi9-python-3.11-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-datascience-ubi9-python-3.11-pr-${{ env.PR }}

diff --git a/Makefile b/Makefile
@@ -188,41 +188,6 @@ runtime-cuda-tensorflow-ubi9-python-3.11: cuda-ubi9-python-3.11
 codeserver-ubi9-python-3.11: base-ubi9-python-3.11
 	$(call image,$@,codeserver/ubi9-python-3.11,$<)
 
-# Build and push base-anaconda-python-3.11-intel-gpu image to the registry
-.PHONY: intel-base-gpu-ubi9-python-3.11
-intel-base-gpu-ubi9-python-3.11: base-ubi9-python-3.11
-	$(call image,$@,intel/base/gpu/ubi9-python-3.11,$<)
-
-# Build and push intel-runtime-tensorflow-ubi9-python-3.11 image to the registry
-.PHONY: intel-runtime-tensorflow-ubi9-python-3.11
-intel-runtime-tensorflow-ubi9-python-3.11: intel-base-gpu-ubi9-python-3.11
-	$(call image,$@,intel/runtimes/tensorflow/ubi9-python-3.11,$<)
-
-# Build and push jupyter-intel-tensorflow-ubi9-python-3.11 image to the registry
-.PHONY: jupyter-intel-tensorflow-ubi9-python-3.11
-jupyter-intel-tensorflow-ubi9-python-3.11: intel-base-gpu-ubi9-python-3.11
-	$(call image,$@,jupyter/intel/tensorflow/ubi9-python-3.11,$<)
-
-# Build and push intel-runtime-pytorch-ubi9-python-3.11 image to the registry
-.PHONY: intel-runtime-pytorch-ubi9-python-3.11
-intel-runtime-pytorch-ubi9-python-3.11: intel-base-gpu-ubi9-python-3.11
-	$(call image,$@,intel/runtimes/pytorch/ubi9-python-3.11,$<)
-
-# Build and push jupyter-intel-pytorch-ubi9-python-3.11 image to the registry
-.PHONY: jupyter-intel-pytorch-ubi9-python-3.11
-jupyter-intel-pytorch-ubi9-python-3.11: intel-base-gpu-ubi9-python-3.11
-	$(call image,$@,jupyter/intel/pytorch/ubi9-python-3.11,$<)
-
-# Build and push intel-runtime-ml-ubi9-python-3.11 image to the registry
-.PHONY: intel-runtime-ml-ubi9-python-3.11
-intel-runtime-ml-ubi9-python-3.11: base-ubi9-python-3.11
-	$(call image,$@,intel/runtimes/ml/ubi9-python-3.11,$<)
-
-# Build and push jupyter-intel-ml-ubi9-python-3.11 image to the registry
-.PHONY: jupyter-intel-ml-ubi9-python-3.11
-jupyter-intel-ml-ubi9-python-3.11: base-ubi9-python-3.11
-	$(call image,$@,jupyter/intel/ml/ubi9-python-3.11,$<)
-
 ####################################### Buildchain for Python 3.11 using C9S #######################################
 
 # Build and push base-c9s-python-3.11 image to the registry
@@ -469,12 +434,7 @@ BASE_DIRS := base/c9s-python-$(PYTHON_VERSION) \
 # Default value is false, can be overiden
 # The below directories are not supported on tier-1
 INCLUDE_OPT_DIRS ?= false
-OPT_DIRS := jupyter/intel/ml/ubi9-python-$(PYTHON_VERSION) \
-		jupyter/intel/pytorch/ubi9-python-$(PYTHON_VERSION) \
-		jupyter/intel/tensorflow/ubi9-python-$(PYTHON_VERSION) \
-		intel/runtimes/ml/ubi9-python-$(PYTHON_VERSION) \
-		intel/runtimes/pytorch/ubi9-python-$(PYTHON_VERSION) \
-		intel/runtimes/tensorflow/ubi9-python-$(PYTHON_VERSION)
+OPT_DIRS :=
 
 # This recipe gets args, can be used like
 # make refresh-pipfilelock-files PYTHON_VERSION=3.11 INCLUDE_OPT_DIRS=false

diff --git a/ci/cached-builds/gha_pr_changed_files.py b/ci/cached-builds/gha_pr_changed_files.py
@@ -88,10 +88,12 @@ def test_list_changed_files(self):
                                       'codeserver/ubi9-python-3.9/run-code-server.sh'}
 
     def test_analyze_build_directories(self):
-        directories = analyze_build_directories("jupyter-intel-pytorch-ubi9-python-3.11")
+        directories = analyze_build_directories("rocm-jupyter-pytorch-ubi9-python-3.11")
         assert set(directories) == {"base/ubi9-python-3.11",
-                                    "intel/base/gpu/ubi9-python-3.11",
-                                    "jupyter/intel/pytorch/ubi9-python-3.11"}
+                                    "rocm/ubi9-python-3.11",
+                                    "jupyter/minimal/ubi9-python-3.11",
+                                    "jupyter/datascience/ubi9-python-3.11",
+                                    "jupyter/rocm/pytorch/ubi9-python-3.11"}
 
     def test_should_build_target(self):
         assert "" == should_build_target(["README.md"], ["jupyter/datascience/ubi9-python-3.11"])
diff --git a/ci/cached-builds/has_tests.py b/ci/cached-builds/has_tests.py
@@ -36,8 +36,6 @@ def main() -> None:
 def check_tests(target: str) -> bool:
     if target.startswith("rocm-jupyter-minimal-") or target.startswith("rocm-jupyter-datascience-"):
         return False  # we don't have specific tests for -minimal-, ... in ci-operator/config
-    if '-intel-' in target:
-        return False  # RHOAIENG-8388: Intel tensorflow notebook failed to get tested on OCP-CI
 
     has_tests = False
     dirs = gha_pr_changed_files.analyze_build_directories(target)

diff --git a/ci/cached-builds/make_test.py b/ci/cached-builds/make_test.py
@@ -39,9 +39,6 @@ def run_tests(target: str) -> None:
     if target.startswith("runtime-"):
         deploy = "deploy9"
         deploy_target = target.replace("runtime-", "runtimes-")
-    elif target.startswith("intel-runtime-"):
-        deploy = "deploy9"
-        deploy_target = target.replace("intel-runtime-", "intel-runtimes-")
     elif target.startswith("rocm-runtime-"):
         deploy = "deploy9"
         deploy_target = target.replace("rocm-runtime-", "runtimes-rocm-")
@@ -75,7 +72,7 @@ def run_tests(target: str) -> None:
     wait_for_stability(pod)
 
     try:
-        if target.startswith("runtime-") or target.startswith("intel-runtime-"):
+        if target.startswith("runtime-"):
             check_call(f"make validate-runtime-image image={target}", shell=True)
         elif target.startswith("rocm-runtime-"):
             check_call(f"make validate-runtime-image image={target
@@ -219,15 +216,6 @@ def test_make_commands_runtime(self, mock_execute: unittest.mock.Mock) -> None:
         assert "make validate-runtime-image image=runtime-datascience-ubi9-python-3.11" in commands
         assert "make undeploy9-runtimes-datascience-ubi9-python-3.11" in commands
 
-    @unittest.mock.patch("make_test.execute")
-    def test_make_commands_intel_runtime(self, mock_execute: unittest.mock.Mock) -> None:
-        """Compares the commands with what we had in the openshift/release yaml"""
-        run_tests("intel-runtime-ml-ubi9-python-3.11")
-        commands: list[str] = [c[0][1][0] for c in mock_execute.call_args_list]
-        assert "make deploy9-intel-runtimes-ml-ubi9-python-3.11" in commands
-        assert "make validate-runtime-image image=intel-runtime-ml-ubi9-python-3.11" in commands
-        assert "make undeploy9-intel-runtimes-ml-ubi9-python-3.11" in commands
-
     @unittest.mock.patch("make_test.execute")
     def test_make_commands_rocm_runtime(self, mock_execute: unittest.mock.Mock) -> None:
         """Compares the commands with what we had in the openshift/release yaml"""

diff --git a/intel/base/gpu/ubi9-python-3.11/Dockerfile b/intel/base/gpu/ubi9-python-3.11/Dockerfile
diff --git a/intel/runtimes/ml/ubi9-python-3.11/.patch_sklearn.py b/intel/runtimes/ml/ubi9-python-3.11/.patch_sklearn.py
diff --git a/intel/runtimes/ml/ubi9-python-3.11/Dockerfile b/intel/runtimes/ml/ubi9-python-3.11/Dockerfile
diff --git a/intel/runtimes/ml/ubi9-python-3.11/Pipfile b/intel/runtimes/ml/ubi9-python-3.11/Pipfile