From e7a45ba69bb2f49bf05c16b72f33669d993a8f92 Mon Sep 17 00:00:00 2001
From: abhijeet-dhumal <abhijeetdhumal652@gmail.com>
Date: Mon, 15 Jul 2024 20:37:17 +0530
Subject: [PATCH] Update cluster configuration to increase worker memory and
 remove ray-img input parameter given in cluster configuration for e2e tests

---
 tests/e2e/local_interactive_sdk_kind_test.py   | 5 +----
 tests/e2e/local_interactive_sdk_oauth_test.py  | 5 +----
 tests/e2e/mnist_raycluster_sdk_aw_kind_test.py | 3 ---
 tests/e2e/mnist_raycluster_sdk_kind_test.py    | 3 ---
 tests/e2e/mnist_raycluster_sdk_oauth_test.py   | 5 +----
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/tests/e2e/local_interactive_sdk_kind_test.py b/tests/e2e/local_interactive_sdk_kind_test.py
index 4479b41c0..6693117b3 100644
--- a/tests/e2e/local_interactive_sdk_kind_test.py
+++ b/tests/e2e/local_interactive_sdk_kind_test.py
@@ -37,8 +37,6 @@ def test_local_interactives_nvidia_gpu(self):
     def run_local_interactives(
         self, gpu_resource_name="nvidia.com/gpu", number_of_gpus=0
     ):
-        ray_image = get_ray_image()
-
         cluster_name = "test-ray-cluster-li"
 
         cluster = Cluster(
@@ -51,9 +49,8 @@ def run_local_interactives(
                 worker_cpu_requests="500m",
                 worker_cpu_limits=1,
                 worker_memory_requests=1,
-                worker_memory_limits=2,
+                worker_memory_limits=4,
                 worker_extended_resource_requests={gpu_resource_name: number_of_gpus},
-                image=ray_image,
                 write_to_file=True,
                 verify_tls=False,
             )
diff --git a/tests/e2e/local_interactive_sdk_oauth_test.py b/tests/e2e/local_interactive_sdk_oauth_test.py
index 4177413ec..0e5c0204c 100644
--- a/tests/e2e/local_interactive_sdk_oauth_test.py
+++ b/tests/e2e/local_interactive_sdk_oauth_test.py
@@ -28,8 +28,6 @@ def test_local_interactives(self):
         self.run_local_interactives()
 
     def run_local_interactives(self):
-        ray_image = get_ray_image()
-
         auth = TokenAuthentication(
             token=run_oc_command(["whoami", "--show-token=true"]),
             server=run_oc_command(["whoami", "--show-server=true"]),
@@ -46,9 +44,8 @@ def run_local_interactives(self):
                 num_workers=1,
                 worker_cpu_requests=1,
                 worker_cpu_limits=1,
-                worker_memory_requests=4,
+                worker_memory_requests=1,
                 worker_memory_limits=4,
-                image=ray_image,
                 verify_tls=False,
             )
         )
diff --git a/tests/e2e/mnist_raycluster_sdk_aw_kind_test.py b/tests/e2e/mnist_raycluster_sdk_aw_kind_test.py
index 39bd25fda..d2d0995b6 100644
--- a/tests/e2e/mnist_raycluster_sdk_aw_kind_test.py
+++ b/tests/e2e/mnist_raycluster_sdk_aw_kind_test.py
@@ -36,8 +36,6 @@ def test_mnist_ray_cluster_sdk_kind_nvidia_gpu(self):
     def run_mnist_raycluster_sdk_kind(
         self, accelerator, gpu_resource_name="nvidia.com/gpu", number_of_gpus=0
     ):
-        ray_image = get_ray_image()
-
         cluster = Cluster(
             ClusterConfiguration(
                 name="mnist",
@@ -50,7 +48,6 @@ def run_mnist_raycluster_sdk_kind(
                 worker_memory_requests=1,
                 worker_memory_limits=4,
                 worker_extended_resource_requests={gpu_resource_name: number_of_gpus},
-                image=ray_image,
                 write_to_file=True,
                 verify_tls=False,
                 appwrapper=True,
diff --git a/tests/e2e/mnist_raycluster_sdk_kind_test.py b/tests/e2e/mnist_raycluster_sdk_kind_test.py
index 356d56f98..2635fecd8 100644
--- a/tests/e2e/mnist_raycluster_sdk_kind_test.py
+++ b/tests/e2e/mnist_raycluster_sdk_kind_test.py
@@ -37,8 +37,6 @@ def test_mnist_ray_cluster_sdk_kind_nvidia_gpu(self):
     def run_mnist_raycluster_sdk_kind(
         self, accelerator, gpu_resource_name="nvidia.com/gpu", number_of_gpus=0
     ):
-        ray_image = get_ray_image()
-
         cluster = Cluster(
             ClusterConfiguration(
                 name="mnist",
@@ -51,7 +49,6 @@ def run_mnist_raycluster_sdk_kind(
                 worker_memory_requests=1,
                 worker_memory_limits=4,
                 worker_extended_resource_requests={gpu_resource_name: number_of_gpus},
-                image=ray_image,
                 write_to_file=True,
                 verify_tls=False,
             )
diff --git a/tests/e2e/mnist_raycluster_sdk_oauth_test.py b/tests/e2e/mnist_raycluster_sdk_oauth_test.py
index 4e85e9f1d..0ddab720b 100644
--- a/tests/e2e/mnist_raycluster_sdk_oauth_test.py
+++ b/tests/e2e/mnist_raycluster_sdk_oauth_test.py
@@ -28,8 +28,6 @@ def test_mnist_ray_cluster_sdk_auth(self):
         self.run_mnist_raycluster_sdk_oauth()
 
     def run_mnist_raycluster_sdk_oauth(self):
-        ray_image = get_ray_image()
-
         auth = TokenAuthentication(
             token=run_oc_command(["whoami", "--show-token=true"]),
             server=run_oc_command(["whoami", "--show-server=true"]),
@@ -47,8 +45,7 @@ def run_mnist_raycluster_sdk_oauth(self):
                 worker_cpu_requests="500m",
                 worker_cpu_limits=1,
                 worker_memory_requests=1,
-                worker_memory_limits=2,
-                image=ray_image,
+                worker_memory_limits=4,
                 write_to_file=True,
                 verify_tls=False,
             )