DW: Add test coverage for custom ROCm Ray image

red-hat-data-services · Dec 10, 2024 · f4a85a2 · f4a85a2
1 parent 9b516c2
commit f4a85a2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource
@@ -16,6 +16,8 @@ ${RAY_CUDA_IMAGE_3.11}                   quay.io/modh/ray@sha256:db667df1bc437a7
 ${RAY_TORCH_CUDA_IMAGE_3.11}             quay.io/rhoai/ray@sha256:5077f9bb230dfa88f34089fecdfcdaa8abc6964716a8a8325c7f9dcdf11bbbb3
 # Corresponds to quay.io/modh/ray:2.35.0-py311-rocm61
 ${RAY_ROCM_IMAGE_3.11}                   quay.io/modh/ray@sha256:f8b4f2b1c954187753c1f5254f7bb6a4286cec5a4f1b43def7ef4e009f2d28cb
+# Corresponds to quay.io/rhoai/ray:2.35.0-py311-rocm61-torch24-fa26
+${RAY_TORCH_ROCM_IMAGE_3.11}             quay.io/rhoai/ray@sha256:b0e129cd2f4cdea7ad7a7859031357ffd9915410551f94fbcb942af2198cdf78
 # Corresponds to quay.io/modh/ray:2.35.0-py39-cu121
 ${RAY_CUDA_IMAGE_3.9}                    quay.io/modh/ray@sha256:0d715f92570a2997381b7cafc0e224cfa25323f18b9545acfd23bc2b71576d06
 # Corresponds to quay.io/rhoai/ray:2.35.0-py39-cu121-torch24-fa26

diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/test-run-distributed-workloads-tests.robot b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-distributed-workloads-tests.robot
@@ -55,21 +55,41 @@ Run TestRayTuneHPOGpu ODH test with Python 3.11
     ...     WorkloadsOrchestration
     Run DistributedWorkloads ODH Test    TestMnistRayTuneHpoGpu    ${RAY_CUDA_IMAGE_3.11}    ${NOTEBOOK_IMAGE_3.11}
 
-Run TestKueueCustomRayCpu ODH test with Python 3.11
-    [Documentation]    Run Go ODH test: TestKueueCustomRayCpu
+Run TestKueueCustomRayCudaCpu ODH test with Python 3.11
+    [Documentation]    Run Go ODH test: TestKueueCustomRayCudaCpu
     [Tags]  RHOAIENG-10013
     ...     Tier1
     ...     DistributedWorkloads
     ...     Training
     ...     WorkloadsOrchestration
-    Run DistributedWorkloads ODH Test    TestMnistCustomRayImageCpu    ${RAY_TORCH_CUDA_IMAGE_3.11}    ${NOTEBOOK_IMAGE_3.11}
+    Run DistributedWorkloads ODH Test    TestMnistCustomRayCudaCpu    ${RAY_TORCH_CUDA_IMAGE_3.11}    ${NOTEBOOK_IMAGE_3.11}
 
-Run TestKueueCustomRayGpu ODH test with Python 3.11
-    [Documentation]    Run Go ODH test: TestKueueCustomRayGpu
+Run TestKueueCustomRayCudaGpu ODH test with Python 3.11
+    [Documentation]    Run Go ODH test: TestKueueCustomRayCudaGpu
     [Tags]  RHOAIENG-10013
     ...     Resources-GPU    NVIDIA-GPUs
     ...     Tier1
     ...     DistributedWorkloads
     ...     Training
     ...     WorkloadsOrchestration
-    Run DistributedWorkloads ODH Test    TestMnistCustomRayImageGpu    ${RAY_TORCH_CUDA_IMAGE_3.11}    ${NOTEBOOK_IMAGE_3.11}
+    Run DistributedWorkloads ODH Test    TestMnistCustomRayCudaGpu    ${RAY_TORCH_CUDA_IMAGE_3.11}    ${NOTEBOOK_IMAGE_3.11}
+
+Run TestKueueCustomRayRocmCpu ODH test with Python 3.11
+    [Documentation]    Run Go ODH test: TestKueueCustomRayRocmCpu
+    [Tags]  RHOAIENG-12484
+    ...     ROCm
+    ...     Tier1
+    ...     DistributedWorkloads
+    ...     Training
+    ...     WorkloadsOrchestration
+    Run DistributedWorkloads ODH Test    TestMnistCustomRayRocmCpu    ${RAY_TORCH_ROCM_IMAGE_3.11}    ${NOTEBOOK_IMAGE_3.11}
+
+Run TestKueueCustomRayRocmGpu ODH test with Python 3.11
+    [Documentation]    Run Go ODH test: TestKueueCustomRayRocmGpu
+    [Tags]  RHOAIENG-12484
+    ...     Resources-GPU    AMD-GPUs    ROCm
+    ...     Tier1
+    ...     DistributedWorkloads
+    ...     Training
+    ...     WorkloadsOrchestration
+    Run DistributedWorkloads ODH Test    TestMnistCustomRayRocmGpu    ${RAY_TORCH_ROCM_IMAGE_3.11}    ${NOTEBOOK_IMAGE_3.11}