diff --git a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource index 9810b4c93..9ab164d03 100644 --- a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource +++ b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource @@ -10,7 +10,6 @@ ${CODEFLARE-SDK-API_URL} %{CODEFLARE-SDK-API_URL=https://api.git ${CODEFLARE-SDK_DIR} codeflare-sdk ${CODEFLARE-SDK_REPO_URL} %{CODEFLARE-SDK_REPO_URL=https://github.com/project-codeflare/codeflare-sdk.git} ${DISTRIBUTED_WORKLOADS_RELEASE_ASSETS} https://github.com/opendatahub-io/distributed-workloads/releases/latest/download -${RAY_IMAGE} quay.io/rhoai/ray@sha256:859f5c41d41bad1935bce455ad3732dff9d4d4c342b7155a7cd23809e85698ab ${FMS_HF_TUNING_IMAGE} quay.io/modh/fms-hf-tuning@sha256:8edea6f0f9c4c631cdca1e1c10abf0d4b994738fde78c40d48eda216fdd382f5 ${NOTEBOOK_IMAGE} quay.io/modh/odh-generic-data-science-notebook@sha256:9d7f80080a453bcf7dee01b986df9ee811ee74f6f433c601a8b67d283c160547 ${NOTEBOOK_USER_NAME} ${TEST_USER_3.USERNAME} @@ -189,6 +188,7 @@ Prepare Codeflare E2E Test Suite Restart Kueue Log To Console "Downloading compiled test binary ${ODH_BINARY_NAME}" + ${result} = Run Process curl --location --silent --output ${ODH_BINARY_NAME} ${DISTRIBUTED_WORKLOADS_RELEASE_ASSETS}/${ODH_BINARY_NAME} && chmod +x ${ODH_BINARY_NAME} ... shell=true ... stderr=STDOUT @@ -222,7 +222,7 @@ Generate User Token Run Codeflare ODH Test [Documentation] Run Codeflare ODH Test - [Arguments] ${TEST_NAME} + [Arguments] ${TEST_NAME} ${RAY_IMAGE} Log To Console "Running test: ${TEST_NAME}" ${result} = Run Process ./${ODH_BINARY_NAME} -test.run ${TEST_NAME} ... shell=true diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-run-codeflare-tests.robot b/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-run-codeflare-tests.robot index af8311b9c..68a21e10f 100644 --- a/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-run-codeflare-tests.robot +++ b/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-run-codeflare-tests.robot @@ -8,6 +8,11 @@ Resource ../../../../tasks/Resources/RHODS_OLM/install/oc_install.robot Resource ../../../../tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource +*** Variables *** +${RAY_CUDA_IMAGE} quay.io/modh/ray@sha256:4575dd54fe05213fe9228cd316d5e87a9395cd16b618a85a94995709e5f3aaeb +${RAY_TORCH_CUDA_IMAGE} quay.io/rhoai/ray@sha256:158b481b8e9110008d60ac9fb8d156eadd71cb057ac30382e62e3a231ceb39c0 + + *** Test Cases *** Run TestKueueRayCpu ODH test [Documentation] Run Go ODH test: TestKueueRayCpu @@ -16,7 +21,7 @@ Run TestKueueRayCpu ODH test ... DistributedWorkloads ... Training ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayCpu + Run Codeflare ODH Test TestMnistRayCpu ${RAY_CUDA_IMAGE} Run TestKueueRayGpu ODH test [Documentation] Run Go ODH test: TestKueueRayGpu @@ -25,7 +30,7 @@ Run TestKueueRayGpu ODH test ... DistributedWorkloads ... Training ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayGpu + Run Codeflare ODH Test TestMnistRayGpu ${RAY_CUDA_IMAGE} Run TestRayTuneHPOCpu ODH test [Documentation] Run Go ODH test: TestMnistRayTuneHpoCpu @@ -34,7 +39,7 @@ Run TestRayTuneHPOCpu ODH test ... DistributedWorkloads ... Training ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayTuneHpoCpu + Run Codeflare ODH Test TestMnistRayTuneHpoCpu ${RAY_CUDA_IMAGE} Run TestRayTuneHPOGpu ODH test [Documentation] Run Go ODH test: TestMnistRayTuneHpoGpu @@ -43,4 +48,23 @@ Run TestRayTuneHPOGpu ODH test ... DistributedWorkloads ... Training ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayTuneHpoGpu + Run Codeflare ODH Test TestMnistRayTuneHpoGpu ${RAY_CUDA_IMAGE} + +Run TestKueueCustomRayCpu ODH test + [Documentation] Run Go ODH test: TestKueueCustomRayCpu + [Tags] RHOAIENG-10013 + ... Tier1 + ... DistributedWorkloads + ... Training + ... CodeflareOperator + Run Codeflare ODH Test TestMnistCustomRayImageCpu ${RAY_TORCH_CUDA_IMAGE} + +Run TestKueueCustomRayGpu ODH test + [Documentation] Run Go ODH test: TestKueueCustomRayGpu + [Tags] RHOAIENG-10013 + ... Resources-GPU + ... Tier1 + ... DistributedWorkloads + ... Training + ... CodeflareOperator + Run Codeflare ODH Test TestMnistCustomRayImageGpu ${RAY_TORCH_CUDA_IMAGE}