update path for KFTO and FMS tests

This reverts commit c52c223.
red-hat-data-services · Jan 6, 2025 · 0b7a4c2 · 0b7a4c2
1 parent 0290749
commit 0b7a4c2
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 63 deletions.
diff --git a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource
@@ -35,8 +35,8 @@ ${NOTEBOOK_IMAGE_3.11}                   quay.io/modh/odh-generic-data-science-n
 ${NOTEBOOK_IMAGE_3.9}                    quay.io/modh/odh-generic-data-science-notebook@sha256:b1066204611b4bcfa6172c3115650a8e8393089d5606458fa0d8c53633d2ce17
 ${NOTEBOOK_USER_NAME}                    ${TEST_USER_3.USERNAME}
 ${NOTEBOOK_USER_PASSWORD}                ${TEST_USER_3.PASSWORD}
-${KFTO_CORE_BINARY_NAME}                 kfto
-${KFTO_UPGRADE_BINARY_NAME}              kfto-upgrade
+${FMS_BINARY_NAME}                       fms
+${KFTO_BINARY_NAME}                      kfto
 ${ODH_BINARY_NAME}                       odh
 ${PIP_INDEX_URL}                         ${PIP_INDEX_URL}
 ${PIP_TRUSTED_HOST}                      ${PIP_TRUSTED_HOST}
@@ -105,13 +105,13 @@ Cleanup Codeflare-SDK Setup
     Log To Console     "Removing directory ${CODEFLARE-SDK_DIR}"
     Remove Directory        ${CODEFLARE-SDK_DIR}    recursive=True
 
-Prepare Training Operator E2E Core Test Suite
-    [Documentation]    Prepare Training Operator E2E Core Test Suite
-    Prepare Training Operator E2E Test Suite    ${KFTO_CORE_BINARY_NAME}
+Prepare Training Operator KFTO E2E Test Suite
+    [Documentation]    Prepare Training Operator KFTO E2E Test Suite
+    Prepare Training Operator E2E Test Suite    ${KFTO_BINARY_NAME}
 
-Prepare Training Operator E2E Upgrade Test Suite
-    [Documentation]    Prepare Training Operator E2E Upgrade Test Suite
-    Prepare Training Operator E2E Test Suite    ${KFTO_UPGRADE_BINARY_NAME}
+Prepare Training Operator FMS E2E Test Suite
+    [Documentation]    Prepare Training Operator FMS E2E Test Suite
+    Prepare Training Operator E2E Test Suite    ${FMS_BINARY_NAME}
 
 Prepare Training Operator E2E Test Suite
     [Documentation]    Prepare Training Operator E2E Test Suite
@@ -128,13 +128,13 @@ Prepare Training Operator E2E Test Suite
     Enable Component    trainingoperator
     Wait Component Ready    trainingoperator
 
-Teardown Training Operator E2E Core Test Suite
-    [Documentation]    Prepare Training Operator E2E Core Test Suite
-    Teardown Training Operator E2E Test Suite    ${KFTO_CORE_BINARY_NAME}
+Teardown Training Operator KFTO E2E Test Suite
+    [Documentation]    Teardown Training Operator KFTO E2E Test Suite
+    Teardown Training Operator E2E Test Suite    ${KFTO_BINARY_NAME}
 
-Teardown Training Operator E2E Upgrade Test Suite
-    [Documentation]    Prepare Training Operator E2E Upgrade Test Suite
-    Teardown Training Operator E2E Test Suite    ${KFTO_UPGRADE_BINARY_NAME}
+Teardown Training Operator FMS E2E Test Suite
+    [Documentation]    Teardown Training Operator FMS E2E Test Suite
+    Teardown Training Operator E2E Test Suite    ${FMS_BINARY_NAME}
 
 Teardown Training Operator E2E Test Suite
     [Documentation]    Teardown Training Operator E2E Test Suite
@@ -143,27 +143,17 @@ Teardown Training Operator E2E Test Suite
     Remove File        ${test_binary}
     Disable Component    trainingoperator
 
-Run Training Operator ODH Core Test
-    [Documentation]    Run Training Operator ODH Core Test
+Run Training Operator FMS Test
+    [Documentation]    Run Training Operator FMS Test
     [Arguments]    ${TEST_NAME}
-    Run Training Operator ODH Test   ${TEST_NAME}   ${KFTO_CORE_BINARY_NAME}
-
-Run Training Operator ODH Upgrade Test
-    [Documentation]    Run Training Operator ODH Upgrade Test
-    [Arguments]    ${TEST_NAME}
-    Run Training Operator ODH Test   ${TEST_NAME}   ${KFTO_UPGRADE_BINARY_NAME}
-
-Run Training Operator ODH Test
-    [Documentation]    Run Training Operator ODH Test
-    [Arguments]    ${TEST_NAME}    ${test_binary}
     Log To Console    "Running test: ${TEST_NAME}"
-    ${result} =    Run Process    ./${test_binary} -test.run ${TEST_NAME}
+    ${result} =    Run Process    ./${FMS_BINARY_NAME} -test.run ${TEST_NAME}
     ...    shell=true
     ...    stderr=STDOUT
     ...    env:CODEFLARE_TEST_TIMEOUT_SHORT=5m
     ...    env:CODEFLARE_TEST_TIMEOUT_MEDIUM=10m
     ...    env:CODEFLARE_TEST_TIMEOUT_LONG=20m
-    ...    env:CODEFLARE_TEST_OUTPUT_DIR=%{WORKSPACE}/codeflare-${test_binary}-logs
+    ...    env:CODEFLARE_TEST_OUTPUT_DIR=%{WORKSPACE}/codeflare-${FMS_BINARY_NAME}-logs
     ...    env:FMS_HF_TUNING_IMAGE=${FMS_HF_TUNING_IMAGE}
     Log To Console    ${result.stdout}
     Check missing Go test    ${result.stdout}
@@ -175,13 +165,13 @@ Run Training Operator KFTO Test
     [Documentation]    Run Training Operator KFTO Test
     [Arguments]    ${TEST_NAME}    ${TRAINING_IMAGE}
     Log To Console    "Running test: ${TEST_NAME}"
-    ${result} =    Run Process    ./${KFTO_CORE_BINARY_NAME} -test.run ${TEST_NAME}
+    ${result} =    Run Process    ./${KFTO_BINARY_NAME} -test.run ${TEST_NAME}
     ...    shell=true
     ...    stderr=STDOUT
     ...    env:CODEFLARE_TEST_TIMEOUT_SHORT=5m
     ...    env:CODEFLARE_TEST_TIMEOUT_MEDIUM=10m
     ...    env:CODEFLARE_TEST_TIMEOUT_LONG=20m
-    ...    env:CODEFLARE_TEST_OUTPUT_DIR=%{WORKSPACE}/codeflare-${KFTO_CORE_BINARY_NAME}-logs
+    ...    env:CODEFLARE_TEST_OUTPUT_DIR=%{WORKSPACE}/codeflare-${KFTO_BINARY_NAME}-logs
     ...    env:CODEFLARE_TEST_TRAINING_IMAGE=${TRAINING_IMAGE}
     Log To Console    ${result.stdout}
     Check missing Go test    ${result.stdout}

diff --git a/ods_ci/tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot b/ods_ci/tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot
@@ -220,19 +220,19 @@ Verify Distributed Workload Metrics Resources By Creating Ray Cluster Workload
     [Teardown]      Run Keywords        Cleanup Codeflare-SDK Setup     AND
     ...     Run Keyword If Test Failed      Codeflare Upgrade Tests Teardown        ${PRJ_UPGRADE}      ${DW_PROJECT_CREATED}       # robocop: disable:line-too-long
 
-Run Training Operator ODH Setup PyTorchJob Test Use Case
-    [Documentation]    Run Training Operator ODH Setup PyTorchJob Test Use Case
+Run Training Operator FMS Setup PyTorchJob Test Use Case
+    [Documentation]    Run Training Operator FMS Setup PyTorchJob Test Use Case
     [Tags]      Upgrade
-    [Setup]     Prepare Training Operator E2E Upgrade Test Suite
-    Run Training Operator ODH Upgrade Test      TestSetupPytorchjob
-    [Teardown]      Teardown Training Operator E2E Upgrade Test Suite
+    [Setup]     Prepare Training Operator FMS E2E Test Suite
+    Run Training Operator FMS Test    TestSetupPytorchjob
+    [Teardown]    Teardown Training Operator FMS E2E Test Suite
 
-Run Training Operator ODH Setup Sleep PyTorchJob Test Use Case
+Run Training Operator FMS Setup Sleep PyTorchJob Test Use Case
     [Documentation]    Setup PyTorchJob which is kept running for 24 hours
     [Tags]      Upgrade
-    [Setup]     Prepare Training Operator E2E Upgrade Test Suite
-    Run Training Operator ODH Upgrade Test          TestSetupSleepPytorchjob
-    [Teardown]      Teardown Training Operator E2E Upgrade Test Suite
+    [Setup]     Prepare Training Operator FMS E2E Test Suite
+    Run Training Operator FMS Test    TestSetupSleepPytorchjob
+    [Teardown]    Teardown Training Operator FMS E2E Test Suite
 
 Data Science Pipelines Pre Upgrade Configuration
     [Documentation]    Creates project dsp-test-upgrade and configures the pipeline resources testing upgrade

diff --git a/ods_ci/tests/Tests/0200__rhoai_upgrade/0203__post_upgrade.robot b/ods_ci/tests/Tests/0200__rhoai_upgrade/0203__post_upgrade.robot
@@ -230,19 +230,19 @@ Verify Ray Cluster Exists And Monitor Workload Metrics By Submitting Ray Job Aft
     [Teardown]      Run Keywords        Cleanup Codeflare-SDK Setup     AND
     ...     Codeflare Upgrade Tests Teardown        ${PRJ_UPGRADE}      ${DW_PROJECT_CREATED}
 
-Run Training Operator ODH Run PyTorchJob Test Use Case
-    [Documentation]    Run Training Operator ODH Run PyTorchJob Test Use Case
+Run Training Operator FMS Run PyTorchJob Test Use Case
+    [Documentation]    Run Training Operator FMS Run PyTorchJob Test Use Case
     [Tags]      Upgrade
-    [Setup]     Prepare Training Operator E2E Upgrade Test Suite
-    Run Training Operator ODH Upgrade Test          TestRunPytorchjob
-    [Teardown]      Teardown Training Operator E2E Upgrade Test Suite
+    [Setup]     Prepare Training Operator FMS E2E Test Suite
+    Run Training Operator FMS Test          TestRunPytorchjob
+    [Teardown]      Teardown Training Operator FMS E2E Test Suite
 
-Run Training Operator ODH Run Sleep PyTorchJob Test Use Case
+Run Training Operator FMS Run Sleep PyTorchJob Test Use Case
     [Documentation]    Verify that running PyTorchJob Pod wasn't restarted
     [Tags]      Upgrade
-    [Setup]     Prepare Training Operator E2E Upgrade Test Suite
-    Run Training Operator ODH Upgrade Test      TestVerifySleepPytorchjob
-    [Teardown]      Teardown Training Operator E2E Upgrade Test Suite
+    [Setup]     Prepare Training Operator FMS E2E Test Suite
+    Run Training Operator FMS Test      TestVerifySleepPytorchjob
+    [Teardown]      Teardown Training Operator FMS E2E Test Suite
 
 Verify that the must-gather image provides RHODS logs and info
     [Documentation]    Tests the must-gather image for ODH/RHOAI after upgrading

diff --git a/...ests/Tests/0600__distributed_workloads/0602__training/test-run-training-stack-tests.robot b/...ests/Tests/0600__distributed_workloads/0602__training/test-run-training-stack-tests.robot
@@ -1,7 +1,7 @@
 *** Settings ***
-Documentation     Training operator E2E tests - https://github.com/opendatahub-io/distributed-workloads/tree/main/tests/kfto/core
-Suite Setup       Prepare Training Operator E2E Core Test Suite
-Suite Teardown    Teardown Training Operator E2E Core Test Suite
+Documentation     Training Operator KFTO E2E tests - https://github.com/opendatahub-io/distributed-workloads/tree/main/tests/kfto
+Suite Setup       Prepare Training Operator KFTO E2E Test Suite
+Suite Teardown    Teardown Training Operator KFTO E2E Test Suite
 Library           OperatingSystem
 Library           Process
 Resource          ../../../../tasks/Resources/RHODS_OLM/install/oc_install.robot

diff --git a/.../tests/Tests/0600__distributed_workloads/0602__training/test-run-tuning-stack-tests.robot b/.../tests/Tests/0600__distributed_workloads/0602__training/test-run-tuning-stack-tests.robot
@@ -1,31 +1,31 @@
 *** Settings ***
-Documentation     Training operator E2E tests - https://github.com/opendatahub-io/distributed-workloads/tree/main/tests/kfto
-Suite Setup       Prepare Training Operator E2E Core Test Suite
-Suite Teardown    Teardown Training Operator E2E Core Test Suite
+Documentation     Training Operator FMS E2E tests - https://github.com/opendatahub-io/distributed-workloads/tree/main/tests/fms
+Suite Setup       Prepare Training Operator FMS E2E Test Suite
+Suite Teardown    Teardown Training Operator FMS E2E Test Suite
 Library           OperatingSystem
 Library           Process
 Resource          ../../../../tasks/Resources/RHODS_OLM/install/oc_install.robot
 Resource          ../../../../tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource
 
 
 *** Test Cases ***
-Run Training operator ODH test base finetuning use case
-    [Documentation]    Run Go ODH tests for Training operator base finetuning use case
+Run Training operator FMS test base finetuning use case
+    [Documentation]    Run Go FMS tests for Training operator base finetuning use case
     [Tags]  RHOAIENG-6965
     ...     Tier1
     ...     DistributedWorkloads
     ...     Training
     ...     TrainingOperator
-    Run Training Operator ODH Core Test    TestPytorchjobWithSFTtrainerFinetuning
+    Run Training Operator FMS Test    TestPytorchjobWithSFTtrainerFinetuning
 
-Run Training operator ODH test base LoRA use case
-    [Documentation]    Run Go ODH tests for Training operator base LoRA use case
+Run Training operator FMS test base LoRA use case
+    [Documentation]    Run Go FMS tests for Training operator base LoRA use case
     [Tags]  RHOAIENG-6965
     ...     Tier1
     ...     DistributedWorkloads
     ...     Training
     ...     TrainingOperator
-    Run Training Operator ODH Core Test    TestPytorchjobWithSFTtrainerLoRa
+    Run Training Operator FMS Test    TestPytorchjobWithSFTtrainerLoRa
 
 ## Note : This test is disabled because the required model supported for QLoRA test is not available
 # Run Training operator ODH test base QLoRA use case
@@ -38,11 +38,11 @@ Run Training operator ODH test base LoRA use case
 #     ...     TrainingOperator
 #     Run Training Operator ODH Core Test    TestPytorchjobWithSFTtrainerQLoRa
 
-Run Training operator ODH test with Kueue quota
-    [Documentation]    Run Go ODH tests for Training operator with Kueue quota
+Run Training operator FMS test with Kueue quota
+    [Documentation]    Run Go FMS tests for Training operator with Kueue quota
     [Tags]  RHOAIENG-6965
     ...     Tier1
     ...     DistributedWorkloads
     ...     Training
     ...     TrainingOperator
-    Run Training Operator ODH Core Test    TestPytorchjobUsingKueueQuota
+    Run Training Operator FMS Test    TestPytorchjobUsingKueueQuota