Skip to content

Commit e9935db

Browse files
committed
RHOAIENG-39075: Add new E2E test structure and initial existing cluster test
1 parent b713531 commit e9935db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+5115
-23
lines changed

src/codeflare_sdk/ray/cluster/config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ class ClusterConfiguration:
9898

9999
name: str
100100
namespace: Optional[str] = None
101-
head_cpu_requests: Union[int, str] = 2
101+
head_cpu_requests: Union[int, str] = 1
102102
head_cpu_limits: Union[int, str] = 2
103-
head_memory_requests: Union[int, str] = 8
103+
head_memory_requests: Union[int, str] = 5
104104
head_memory_limits: Union[int, str] = 8
105105
head_extended_resource_requests: Dict[str, Union[str, int]] = field(
106106
default_factory=dict
@@ -109,8 +109,8 @@ class ClusterConfiguration:
109109
worker_cpu_requests: Union[int, str] = 1
110110
worker_cpu_limits: Union[int, str] = 1
111111
num_workers: int = 1
112-
worker_memory_requests: Union[int, str] = 2
113-
worker_memory_limits: Union[int, str] = 2
112+
worker_memory_requests: Union[int, str] = 3
113+
worker_memory_limits: Union[int, str] = 6
114114
worker_tolerations: Optional[List[V1Toleration]] = None
115115
appwrapper: bool = False
116116
envs: Dict[str, str] = field(default_factory=dict)

src/codeflare_sdk/ray/cluster/test_pretty_print.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ def test_ray_details(mocker, capsys):
8585
name="raytest1",
8686
status=RayClusterStatus.READY,
8787
num_workers=1,
88-
worker_mem_requests="2G",
89-
worker_mem_limits="2G",
88+
worker_mem_requests="3G",
89+
worker_mem_limits="6G",
9090
worker_cpu_requests=1,
9191
worker_cpu_limits=1,
9292
namespace="ns",
9393
dashboard="fake-uri",
94-
head_cpu_requests=2,
94+
head_cpu_requests=1,
9595
head_cpu_limits=2,
96-
head_mem_requests=8,
96+
head_mem_requests=5,
9797
head_mem_limits=8,
9898
)
9999
mocker.patch(
@@ -150,7 +150,7 @@ def test_ray_details(mocker, capsys):
150150
" │ ╭── Workers ──╮ ╭───────── Worker specs(each) ─────────╮ │ \n"
151151
" │ │ # Workers │ │ Memory CPU GPU │ │ \n"
152152
" │ │ │ │ │ │ \n"
153-
" │ │ 1 │ │ 2G~2G 1~1 0 │ │ \n"
153+
" │ │ 1 │ │ 3G~6G 1~1 0 │ │ \n"
154154
" │ │ │ │ │ │ \n"
155155
" │ ╰─────────────╯ ╰──────────────────────────────────────╯ │ \n"
156156
" ╰───────────────────────────────────────────────────────────────╯ \n"
@@ -168,7 +168,7 @@ def test_ray_details(mocker, capsys):
168168
" │ ╭── Workers ──╮ ╭───────── Worker specs(each) ─────────╮ │ \n"
169169
" │ │ # Workers │ │ Memory CPU GPU │ │ \n"
170170
" │ │ │ │ │ │ \n"
171-
" │ │ 1 │ │ 2G~2G 1~1 0 │ │ \n"
171+
" │ │ 1 │ │ 3G~6G 1~1 0 │ │ \n"
172172
" │ │ │ │ │ │ \n"
173173
" │ ╰─────────────╯ ╰──────────────────────────────────────╯ │ \n"
174174
" ╰───────────────────────────────────────────────────────────────╯ \n"
@@ -184,7 +184,7 @@ def test_ray_details(mocker, capsys):
184184
"│ ╭── Workers ──╮ ╭───────── Worker specs(each) ─────────╮ │\n"
185185
"│ │ # Workers │ │ Memory CPU GPU │ │\n"
186186
"│ │ │ │ │ │\n"
187-
"│ │ 1 │ │ 2G~2G 1~1 0 │ │\n"
187+
"│ │ 1 │ │ 3G~6G 1~1 0 │ │\n"
188188
"│ │ │ │ │ │\n"
189189
"│ ╰─────────────╯ ╰──────────────────────────────────────╯ │\n"
190190
"╰───────────────────────────────────────────────────────────────╯\n"

src/codeflare_sdk/ray/rayjobs/rayjob.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,9 @@ def _validate_priority_class(self):
478478
Raises ValueError if the priority class is definitively known not to exist.
479479
If we cannot verify (e.g., permission denied), logs a warning and allows submission.
480480
"""
481+
if self._cluster_config is None:
482+
return
483+
481484
if self.priority_class:
482485
logger.debug(f"Validating priority class '{self.priority_class}'...")
483486
exists = priority_class_exists(self.priority_class)

tests/e2e_v2/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# E2E Test Suite v2
2+
# Restructured pytest-based E2E tests for CodeFlare SDK

tests/e2e_v2/cluster_management/__init__.py

Whitespace-only changes.

tests/e2e_v2/cluster_management/configuration/__init__.py

Whitespace-only changes.

tests/e2e_v2/cluster_management/configuration/test_advanced.py

Whitespace-only changes.

tests/e2e_v2/cluster_management/configuration/test_heterogeneous.py

Whitespace-only changes.

tests/e2e_v2/cluster_management/configuration/test_images.py

Whitespace-only changes.

tests/e2e_v2/cluster_management/configuration/test_resources.py

Whitespace-only changes.

0 commit comments

Comments
 (0)