From f40fdbb3554e0b2a2c27080a024c2376c6c0cba2 Mon Sep 17 00:00:00 2001 From: Jorge Date: Tue, 8 Oct 2024 12:43:54 +0200 Subject: [PATCH 1/3] Increase timeout when saving permissions in Dashboard (#1897) Default timeout is 5s, which can be too short sometimes Signed-off-by: Jorge Garcia Oncins --- .../ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource index af04d1105..1459404b6 100644 --- a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource +++ b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource @@ -55,7 +55,7 @@ Select Permission Type Save Permission Element Should Be Enabled ${SAVE_BUTTON} Click Element ${SAVE_BUTTON} - Wait Until Page Does Not Contain Element ${SAVE_BUTTON} + Wait Until Page Does Not Contain Element ${SAVE_BUTTON} timeout=30s Assign ${permission_type} Permissions To Group ${group_name} [Documentation] Assign the user ${group_name} and level of permission ${permission_type} From 26d63406f4926977008ee981609127dd5e437792 Mon Sep 17 00:00:00 2001 From: Srihari Date: Mon, 7 Oct 2024 19:06:23 +0530 Subject: [PATCH 2/3] Update DW UI tests to accommodate changes introduced in 2.14 --- .../Page/DistributedWorkloads/WorkloadMetricsUI.resource | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ods_ci/tests/Resources/Page/DistributedWorkloads/WorkloadMetricsUI.resource b/ods_ci/tests/Resources/Page/DistributedWorkloads/WorkloadMetricsUI.resource index ba800cca7..ae5c2f0a2 100644 --- a/ods_ci/tests/Resources/Page/DistributedWorkloads/WorkloadMetricsUI.resource +++ b/ods_ci/tests/Resources/Page/DistributedWorkloads/WorkloadMetricsUI.resource @@ -41,8 +41,8 @@ Select Distributed Workload Project By Name [Documentation] Select the project in distributed workload metrics page by project name [Arguments] ${project_name} Wait Until Element Is Visible ${PROJECT_XP} timeout=20 - Click Element xpath://*[@data-testid="project-selector-dropdown"] - Click Element xpath://*[@role="menuitem" and string()="${project_name}"] + Click Element xpath://button[@id='project-selector'] + Click Element xpath://button[@role="menuitem" and string()="${project_name}"] Check Expected String Contains [Documentation] Check Expected String Contains with the xpath prvoided get text From 6fcdf354f581b384a9dab536e176cc8f203a512c Mon Sep 17 00:00:00 2001 From: Shilpa Chugh Date: Mon, 7 Oct 2024 15:01:49 +0530 Subject: [PATCH 3/3] Align distributed workloads tests --- .../DistributedWorkloads.resource | 16 ++++----- ...est-distributed-workloads-metrics-ui.robot | 6 ++-- ...est-run-distributed-workloads-tests.robot} | 34 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) rename ods_ci/tests/Tests/0600__distributed_workloads/{0602__training => }/test-distributed-workloads-metrics-ui.robot (97%) rename ods_ci/tests/Tests/0600__distributed_workloads/{0602__training/test-run-codeflare-tests.robot => test-run-distributed-workloads-tests.robot} (56%) diff --git a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource index 544dae6da..0597e923a 100644 --- a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource +++ b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource @@ -182,8 +182,8 @@ Run Training Operator ODH Test FAIL ${TEST_NAME} failed END -Prepare Codeflare E2E Test Suite - [Documentation] Prepare Codeflare E2E Core Test Suite +Prepare DistributedWorkloads Integration Test Suite + [Documentation] Prepare DistributedWorkloads Integration Test Suite Log To Console "Restarting kueue" Restart Kueue @@ -196,7 +196,7 @@ Prepare Codeflare E2E Test Suite IF ${result.rc} != 0 FAIL Unable to retrieve odh compiled binary END - Create Directory %{WORKSPACE}/codeflare-odh-logs + Create Directory %{WORKSPACE}/distributed-workloads-odh-logs Log To Console "Retrieving user tokens" ${common_user_token} = Generate User Token ${NOTEBOOK_USER_NAME} ${NOTEBOOK_USER_PASSWORD} Set Suite Variable ${NOTEBOOK_USER_TOKEN} ${common_user_token} @@ -204,8 +204,8 @@ Prepare Codeflare E2E Test Suite Login To OCP Using API ${OCP_ADMIN_USER.USERNAME} ${OCP_ADMIN_USER.PASSWORD} RHOSi Setup -Teardown Codeflare E2E Test Suite - [Documentation] Teardown Codeflare E2E Test Suite +Teardown DistributedWorkloads Integration Test Suite + [Documentation] Teardown DistributedWorkloads Integration Test Suite Log To Console "Log back as cluster admin" Login To OCP Using API ${OCP_ADMIN_USER.USERNAME} ${OCP_ADMIN_USER.PASSWORD} Log To Console "Removing test binaries" @@ -220,8 +220,8 @@ Generate User Token Should Be Equal As Integers ${rc} ${0} RETURN ${out} -Run Codeflare ODH Test - [Documentation] Run Codeflare ODH Test +Run DistributedWorkloads ODH Test + [Documentation] Run DistributedWorkloads ODH Test [Arguments] ${TEST_NAME} ${RAY_IMAGE} Log To Console "Running test: ${TEST_NAME}" ${result} = Run Process ./${ODH_BINARY_NAME} -test.run ${TEST_NAME} @@ -230,7 +230,7 @@ Run Codeflare ODH Test ... 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-odh-logs + ... env:CODEFLARE_TEST_OUTPUT_DIR=%{WORKSPACE}/distributed-workloads-odh-logs ... env:CODEFLARE_TEST_RAY_IMAGE=${RAY_IMAGE} ... env:ODH_NAMESPACE=${APPLICATIONS_NAMESPACE} ... env:NOTEBOOK_USER_NAME=${NOTEBOOK_USER_NAME} diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-distributed-workloads-metrics-ui.robot b/ods_ci/tests/Tests/0600__distributed_workloads/test-distributed-workloads-metrics-ui.robot similarity index 97% rename from ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-distributed-workloads-metrics-ui.robot rename to ods_ci/tests/Tests/0600__distributed_workloads/test-distributed-workloads-metrics-ui.robot index 2810bb2fe..41321d15f 100644 --- a/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-distributed-workloads-metrics-ui.robot +++ b/ods_ci/tests/Tests/0600__distributed_workloads/test-distributed-workloads-metrics-ui.robot @@ -2,9 +2,9 @@ Documentation Suite to test Workload metrics feature Library SeleniumLibrary Library OpenShiftLibrary -Resource ../../../Resources/Page/DistributedWorkloads/WorkloadMetricsUI.resource -Resource ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource -Resource ../../../../tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource +Resource ../../Resources/Page/DistributedWorkloads/WorkloadMetricsUI.resource +Resource ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource +Resource ../../Resources/Page/DistributedWorkloads/DistributedWorkloads.resource Suite Setup Project Suite Setup Suite Teardown Project Suite Teardown Test Tags DistributedWorkloadMetrics 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/test-run-distributed-workloads-tests.robot similarity index 56% rename from ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-run-codeflare-tests.robot rename to ods_ci/tests/Tests/0600__distributed_workloads/test-run-distributed-workloads-tests.robot index 22eeb9520..1149c38f9 100644 --- a/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-run-codeflare-tests.robot +++ b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-distributed-workloads-tests.robot @@ -1,11 +1,11 @@ *** Settings *** -Documentation Codeflare operator E2E tests - https://github.com/opendatahub-io/distributed-workloads/tree/main/tests/odh -Suite Setup Prepare Codeflare E2E Test Suite -Suite Teardown Teardown Codeflare E2E Test Suite +Documentation Distributed Workloads Integration tests - https://github.com/opendatahub-io/distributed-workloads/tree/main/tests/odh +Suite Setup Prepare DistributedWorkloads Integration Test Suite +Suite Teardown Teardown DistributedWorkloads Integration Test Suite Library OperatingSystem Library Process -Resource ../../../../tasks/Resources/RHODS_OLM/install/oc_install.robot -Resource ../../../../tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource +Resource ../../../tasks/Resources/RHODS_OLM/install/oc_install.robot +Resource ../../Resources/Page/DistributedWorkloads/DistributedWorkloads.resource *** Variables *** @@ -20,8 +20,8 @@ Run TestKueueRayCpu ODH test ... Tier1 ... DistributedWorkloads ... Training - ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayCpu ${RAY_CUDA_IMAGE} + ... WorkloadsOrchestration + Run DistributedWorkloads ODH Test TestMnistRayCpu ${RAY_CUDA_IMAGE} Run TestKueueRayGpu ODH test [Documentation] Run Go ODH test: TestKueueRayGpu @@ -29,8 +29,8 @@ Run TestKueueRayGpu ODH test ... Tier1 ... DistributedWorkloads ... Training - ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayGpu ${RAY_CUDA_IMAGE} + ... WorkloadsOrchestration + Run DistributedWorkloads ODH Test TestMnistRayGpu ${RAY_CUDA_IMAGE} Run TestRayTuneHPOCpu ODH test [Documentation] Run Go ODH test: TestMnistRayTuneHpoCpu @@ -38,8 +38,8 @@ Run TestRayTuneHPOCpu ODH test ... Tier1 ... DistributedWorkloads ... Training - ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayTuneHpoCpu ${RAY_CUDA_IMAGE} + ... WorkloadsOrchestration + Run DistributedWorkloads ODH Test TestMnistRayTuneHpoCpu ${RAY_CUDA_IMAGE} Run TestRayTuneHPOGpu ODH test [Documentation] Run Go ODH test: TestMnistRayTuneHpoGpu @@ -47,8 +47,8 @@ Run TestRayTuneHPOGpu ODH test ... Tier1 ... DistributedWorkloads ... Training - ... CodeflareOperator - Run Codeflare ODH Test TestMnistRayTuneHpoGpu ${RAY_CUDA_IMAGE} + ... WorkloadsOrchestration + Run DistributedWorkloads ODH Test TestMnistRayTuneHpoGpu ${RAY_CUDA_IMAGE} Run TestKueueCustomRayCpu ODH test [Documentation] Run Go ODH test: TestKueueCustomRayCpu @@ -56,8 +56,8 @@ Run TestKueueCustomRayCpu ODH test ... Tier1 ... DistributedWorkloads ... Training - ... CodeflareOperator - Run Codeflare ODH Test TestMnistCustomRayImageCpu ${RAY_TORCH_CUDA_IMAGE} + ... WorkloadsOrchestration + Run DistributedWorkloads ODH Test TestMnistCustomRayImageCpu ${RAY_TORCH_CUDA_IMAGE} Run TestKueueCustomRayGpu ODH test [Documentation] Run Go ODH test: TestKueueCustomRayGpu @@ -66,5 +66,5 @@ Run TestKueueCustomRayGpu ODH test ... Tier1 ... DistributedWorkloads ... Training - ... CodeflareOperator - Run Codeflare ODH Test TestMnistCustomRayImageGpu ${RAY_TORCH_CUDA_IMAGE} + ... WorkloadsOrchestration + Run DistributedWorkloads ODH Test TestMnistCustomRayImageGpu ${RAY_TORCH_CUDA_IMAGE}