RHOAIENG-5435 - Distributed Workloads Components #1392

mattmahoneyrh · 2024-04-17T18:29:51Z

Included are test cases for DSC Distributed Workloads Components Ray, Codeflare and Kueue, tests Manage/Remove management states.

These components are restored to original management state.

ods_ci/tests/Resources/OCP.resource

@@ -220,7 +220,7 @@
    [Documentation]    Checks there are no errors on Pod Logs
    [Arguments]    ${pod_name}    ${pod_namespace}    ${regex_pattern}    ${container}
    ${pod_logs}=    Oc Get Pod Logs  name=${pod_name}  namespace=${pod_namespace}  container=${container}
-    ${match_list} 	 Get Regexp Matches   ${pod_logs}     ${regex_pattern}
+    ${match_list}    Get Regexp Matches   ${pod_logs}     ${regex_pattern}


ods_ci/tests/Resources/ODS.robot

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+    [Tags]    Operator    Tier1    RHOAIENG-5435    codeflare-removed
+
+    Set DSC Component Removed State And Wait For Completion   codeflare    ${CODEFLARE_DEPLOYMENT_NAME}    ${CODEFLARE_LABEL_SELECTOR}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

github-actions · 2024-04-17T18:33:17Z

Robot Results

✅ Passed	❌ Failed	⏭️ Skipped	Total	Pass %
454	0	0	454	100

mattmahoneyrh · 2024-04-17T20:11:02Z

Passed on jekins / RHOAI.

ods_ci/tests/Resources/OCP.resource

ods_ci/tests/Resources/ODS.robot

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

+    [Arguments]    ${dsc}    ${component}    ${namespace}
+
+    ${rc}   ${state}=    Run And Return Rc And Output
+    ...    oc get DataScienceCluster/${dsc} -n ${namespace} -o 'jsonpath={.spec.components.${component}.managementState}'


ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

+Get DSC Component State
+    [Documentation]    Get component management state
+    [Arguments]    ${dsc}    ${component}    ${namespace}
+


ods_ci/tests/Resources/ODS.robot

+    ${rc}    ${out}=    Run And Return Rc And Output
+    ...    oc wait --timeout=${wait_time} --for jsonpath='{.status.conditions[].reason}'=ReconcileCompleted -n ${namespace} dsc ${dsc_name}    # robocop: disable
+    Should Be Equal As Integers    ${rc}     ${0}
+    Log    ${out}    console=${out}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+    ...    check that kueue deployment and pod are created
+    [Tags]    Operator    Tier1    RHOAIENG-5435    kueue-managed
+
+    Set DSC Component Managed State And Wait For Completion   kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+    ${current_state}=    Get DSC Component State    ${DSC_NAME}    ${component}    ${OPERATOR_NS}
+    IF    "${current_state}" != "${saved_state}"
+        IF    "${saved_state}" == "Managed"
+            Set DSC Component Managed State And Wait For Completion    ${component}    ${deployment_name}    ${LABEL_SELECTOR}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+        IF    "${saved_state}" == "Managed"
+            Set DSC Component Managed State And Wait For Completion    ${component}    ${deployment_name}    ${LABEL_SELECTOR}
+        ELSE IF    "${saved_state}" == "Removed"
+            Set DSC Component Removed State And Wait For Completion    ${component}    ${deployment_name}    ${LABEL_SELECTOR}


mattmahoneyrh · 2024-05-01T19:53:37Z

@jstourac @bdattoma Would you be able to review the feedback updates, so that we can get these new tests merged?

…ents

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

+    [Documentation]    Get component management state
+    [Arguments]    ${dsc}    ${component}    ${namespace}
+
+    ${rc}   ${state}=    Run And Return Rc And Output


ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

+    [Arguments]    ${dsc}    ${component}    ${namespace}
+
+    ${rc}   ${state}=    Run And Return Rc And Output
+    ...    oc get DataScienceCluster/${dsc} -n ${namespace} -o 'jsonpath={.spec.components.${component}.managementState}'


jstourac · 2024-05-06T06:30:55Z

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+${RAY_DEPLOYMENT_NAME}          kuberay-operator
+${IS_PRESENT}        0
+${IS_NOT_PRESENT}    1
+&{SAVED_MANATEMENT_STATES}


Would it be possible to rename it to SAVED_MANAGEMENT_STATES?

jstourac · 2024-05-06T06:32:06Z

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+    Set DSC Component Managed State And Wait For Completion   kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}
+
+    [Teardown]     Restore DSC Component State    kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}    ${SAVED_MANATEMENT_STATES.RAY}


Suggested change

[Teardown] Restore DSC Component State kueue ${KUEUE_DEPLOYMENT_NAME} ${KUEUE_LABEL_SELECTOR} ${SAVED_MANATEMENT_STATES.RAY}

[Teardown] Restore DSC Component State kueue ${KUEUE_DEPLOYMENT_NAME} ${KUEUE_LABEL_SELECTOR} ${SAVED_MANATEMENT_STATES.KUEUE}

?

jstourac · 2024-05-06T06:33:58Z

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+    Set DSC Component Removed State And Wait For Completion   kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}
+
+    [Teardown]     Restore DSC Component State    kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}    ${SAVED_MANATEMENT_STATES.RAY}


Suggested change

[Teardown] Restore DSC Component State kueue ${KUEUE_DEPLOYMENT_NAME} ${KUEUE_LABEL_SELECTOR} ${SAVED_MANATEMENT_STATES.RAY}

[Teardown] Restore DSC Component State kueue ${KUEUE_DEPLOYMENT_NAME} ${KUEUE_LABEL_SELECTOR} ${SAVED_MANATEMENT_STATES.KUEUE}

?

jstourac · 2024-05-06T06:34:51Z

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+ Validate Codeflare Managed State
+    [Documentation]    Validate that the DSC by default sets component 'Codeflare' to sate Managed,
+    ...    check that kueue deployment and pod are created


really kueue?

jstourac

I put some comments 🙂

bdattoma · 2024-05-06T07:39:32Z

apart from @jstourac comments, lgtm

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+    Set DSC Component Managed State And Wait For Completion   kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}
+
+    [Teardown]     Restore DSC Component State    kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}    ${SAVED_MANAGEMENT_STATES.KUEUE}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+    Set DSC Component Removed State And Wait For Completion   kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}
+
+    [Teardown]     Restore DSC Component State    kueue    ${KUEUE_DEPLOYMENT_NAME}    ${KUEUE_LABEL_SELECTOR}    ${SAVED_MANAGEMENT_STATES.KUEUE}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+    Set DSC Component Managed State And Wait For Completion   ray    ${RAY_DEPLOYMENT_NAME}    ${RAY_LABEL_SELECTOR}
+
+    [Teardown]     Restore DSC Component State    ray    ${RAY_DEPLOYMENT_NAME}    ${RAY_LABEL_SELECTOR}    ${SAVED_MANAGEMENT_STATES.RAY}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+
+    Set DSC Component Removed State And Wait For Completion   ray    ${RAY_DEPLOYMENT_NAME}    ${RAY_LABEL_SELECTOR}
+
+    [Teardown]     Restore DSC Component State    ray    ${RAY_DEPLOYMENT_NAME}    ${RAY_LABEL_SELECTOR}    ${SAVED_MANAGEMENT_STATES.RAY}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+    [Documentation]    Suite Setup
+    RHOSi Setup
+    Wait For DSC Conditions Reconciled    ${OPERATOR_NS}     ${DSC_NAME}
+    ${SAVED_MANAGEMENT_STATES.RAY}=     Get DSC Component State    ${DSC_NAME}    ray    ${OPERATOR_NS}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+    RHOSi Setup
+    Wait For DSC Conditions Reconciled    ${OPERATOR_NS}     ${DSC_NAME}
+    ${SAVED_MANAGEMENT_STATES.RAY}=     Get DSC Component State    ${DSC_NAME}    ray    ${OPERATOR_NS}
+    ${SAVED_MANAGEMENT_STATES.KUEUE}=     Get DSC Component State    ${DSC_NAME}    kueue    ${OPERATOR_NS}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+    Wait For DSC Conditions Reconciled    ${OPERATOR_NS}     ${DSC_NAME}
+    ${SAVED_MANAGEMENT_STATES.RAY}=     Get DSC Component State    ${DSC_NAME}    ray    ${OPERATOR_NS}
+    ${SAVED_MANAGEMENT_STATES.KUEUE}=     Get DSC Component State    ${DSC_NAME}    kueue    ${OPERATOR_NS}
+    ${SAVED_MANAGEMENT_STATES.CODEFLARE}=     Get DSC Component State    ${DSC_NAME}    codeflare    ${OPERATOR_NS}


...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot

+    ${SAVED_MANAGEMENT_STATES.RAY}=     Get DSC Component State    ${DSC_NAME}    ray    ${OPERATOR_NS}
+    ${SAVED_MANAGEMENT_STATES.KUEUE}=     Get DSC Component State    ${DSC_NAME}    kueue    ${OPERATOR_NS}
+    ${SAVED_MANAGEMENT_STATES.CODEFLARE}=     Get DSC Component State    ${DSC_NAME}    codeflare    ${OPERATOR_NS}
+    Set Suite Variable    ${SAVED_MANAGEMENT_STATES}


mattmahoneyrh · 2024-05-07T17:33:47Z

Addressed latest feedback.
Tests passed in Jenkins.

fyi @jstourac

…ents

sonarqubecloud · 2024-05-08T13:35:26Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

RHOAIENG-5435 - Distributed Workloads Components

788244e

mattmahoneyrh added needs testing Needs to be tested in Jenkins new test New test(s) added (PR will be listed in release-notes) labels Apr 17, 2024

github-advanced-security bot found potential problems Apr 17, 2024

View reviewed changes

mattmahoneyrh removed the needs testing Needs to be tested in Jenkins label Apr 17, 2024

mattmahoneyrh requested review from asanzgom, jgarciao, bdattoma, jstourac and VaishnaviHire April 17, 2024 20:11

bdattoma reviewed Apr 18, 2024

View reviewed changes

ods_ci/tests/Resources/OCP.resource Show resolved Hide resolved

bdattoma reviewed Apr 18, 2024

View reviewed changes

ods_ci/tests/Resources/ODS.robot Outdated Show resolved Hide resolved

bdattoma reviewed Apr 18, 2024

View reviewed changes

...ts/100__deploy/130__operators/130__rhods_operator/142__distributed_workload_components.robot Outdated Show resolved Hide resolved

jiripetrlik previously approved these changes Apr 19, 2024

View reviewed changes

RHOAIENG-5435 - Restore Component States

b5ff3ba

mattmahoneyrh dismissed jiripetrlik’s stale review via b5ff3ba April 25, 2024 12:38

github-advanced-security bot found potential problems Apr 25, 2024

View reviewed changes

mattmahoneyrh added the needs testing Needs to be tested in Jenkins label Apr 25, 2024

asanzgom previously approved these changes Apr 25, 2024

View reviewed changes

mattmahoneyrh added verified This PR has been tested with Jenkins and removed needs testing Needs to be tested in Jenkins labels Apr 25, 2024

mattmahoneyrh requested review from bdattoma and jiripetrlik April 25, 2024 15:56

Merge branch 'master' into RHOAIENG-5435_Distributed_Workloads_Compon…

75386c7

…ents

github-advanced-security bot found potential problems May 6, 2024

View reviewed changes

jstourac reviewed May 6, 2024

View reviewed changes

jstourac requested changes May 6, 2024

View reviewed changes

RHOAIENG-5435_- Address review feedback

5ed072f

mattmahoneyrh dismissed asanzgom’s stale review via 5ed072f May 7, 2024 15:51

github-advanced-security bot found potential problems May 7, 2024

View reviewed changes

RHOAIENG-5435 - Address review feedback

f5676ad

mattmahoneyrh requested review from asanzgom and jstourac May 7, 2024 17:33

Merge branch 'master' into RHOAIENG-5435_Distributed_Workloads_Compon…

288f7b1

…ents

asanzgom approved these changes May 8, 2024

View reviewed changes

jstourac approved these changes May 8, 2024

View reviewed changes

asanzgom merged commit 34ff049 into red-hat-data-services:master May 8, 2024
8 checks passed

mattmahoneyrh deleted the RHOAIENG-5435_Distributed_Workloads_Components branch May 28, 2024 20:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RHOAIENG-5435 - Distributed Workloads Components #1392

RHOAIENG-5435 - Distributed Workloads Components #1392

mattmahoneyrh commented Apr 17, 2024 •

edited

Loading

github-actions bot commented Apr 17, 2024 •

edited

Loading

mattmahoneyrh commented Apr 17, 2024

mattmahoneyrh commented May 1, 2024

jstourac May 6, 2024

jstourac May 6, 2024

jstourac May 6, 2024

jstourac May 6, 2024

jstourac left a comment

bdattoma commented May 6, 2024

mattmahoneyrh commented May 7, 2024 •

edited

Loading

sonarqubecloud bot commented May 8, 2024


		[Tags] Operator Tier1 RHOAIENG-5435 codeflare-removed

		Set DSC Component Removed State And Wait For Completion codeflare ${CODEFLARE_DEPLOYMENT_NAME} ${CODEFLARE_LABEL_SELECTOR}


		Set DSC Component Managed State And Wait For Completion kueue ${KUEUE_DEPLOYMENT_NAME} ${KUEUE_LABEL_SELECTOR}

		[Teardown] Restore DSC Component State kueue ${KUEUE_DEPLOYMENT_NAME} ${KUEUE_LABEL_SELECTOR} ${SAVED_MANATEMENT_STATES.RAY}


		Set DSC Component Managed State And Wait For Completion ray ${RAY_DEPLOYMENT_NAME} ${RAY_LABEL_SELECTOR}

		[Teardown] Restore DSC Component State ray ${RAY_DEPLOYMENT_NAME} ${RAY_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.RAY}

RHOAIENG-5435 - Distributed Workloads Components #1392

RHOAIENG-5435 - Distributed Workloads Components #1392

Conversation

mattmahoneyrh commented Apr 17, 2024 • edited Loading

github-actions bot commented Apr 17, 2024 • edited Loading

Robot Results

mattmahoneyrh commented Apr 17, 2024

mattmahoneyrh commented May 1, 2024

jstourac May 6, 2024

Choose a reason for hiding this comment

jstourac May 6, 2024

Choose a reason for hiding this comment

jstourac May 6, 2024

Choose a reason for hiding this comment

jstourac May 6, 2024

Choose a reason for hiding this comment

jstourac left a comment

Choose a reason for hiding this comment

bdattoma commented May 6, 2024

mattmahoneyrh commented May 7, 2024 • edited Loading

sonarqubecloud bot commented May 8, 2024

Quality Gate passed

mattmahoneyrh commented Apr 17, 2024 •

edited

Loading

github-actions bot commented Apr 17, 2024 •

edited

Loading

mattmahoneyrh commented May 7, 2024 •

edited

Loading