Skip to content

Commit 1b5a788

Browse files
asmigalaopenshift-merge-bot[bot]
asmigala
authored and
openshift-merge-bot[bot]
committed
[RHOAIENG-34453] Remove CodeFlare operator related tests and automations
1 parent a16cf78 commit 1b5a788

File tree

14 files changed

+6
-133
lines changed

14 files changed

+6
-133
lines changed

‎ods_ci/tasks/Resources/Files/dsc_template.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ metadata:
1010
app.kubernetes.io/part-of: <operator_yaml_label>
1111
spec:
1212
components:
13-
codeflare:
14-
devFlags: <codeflare_devflags>
15-
managementState: <codeflare_value>
1613
dashboard:
1714
devFlags: <dashboard_devflags>
1815
managementState: <dashboard_value>

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ Resource ../../../../tests/Resources/OCP.resource
1010
*** Variables ***
1111
${DSC_NAME} = default-dsc
1212
${DSCI_NAME} = default-dsci
13-
@{COMPONENT_LIST} = codeflare
14-
... dashboard
13+
@{COMPONENT_LIST} = dashboard
1514
... datasciencepipelines
1615
... kserve
1716
... kueue
@@ -245,12 +244,6 @@ Verify RHODS Installation
245244
... label_selector=app.kubernetes.io/name=kueue timeout=400s
246245
END
247246

248-
${codeflare} = Is Component Enabled codeflare ${DSC_NAME}
249-
IF "${codeflare}" == "true"
250-
Wait For Deployment Replica To Be Ready namespace=${APPLICATIONS_NAMESPACE}
251-
... label_selector=app.kubernetes.io/part-of=codeflare timeout=400s
252-
END
253-
254247
${ray} = Is Component Enabled ray ${DSC_NAME}
255248
IF "${ray}" == "true"
256249
Wait For Deployment Replica To Be Ready namespace=${APPLICATIONS_NAMESPACE}
@@ -297,7 +290,7 @@ Verify RHODS Installation
297290
END
298291
END
299292

300-
IF "${dashboard}" == "true" or "${workbenches}" == "true" or "${datasciencepipelines}" == "true" or "${kserve}" == "true" or "${kueue}" == "true" or "${codeflare}" == "true" or "${ray}" == "true" or "${trustyai}" == "true" or "${modelregistry}" == "true" or "${trainingoperator}" == "true" # robocop: disable
293+
IF "${dashboard}" == "true" or "${workbenches}" == "true" or "${datasciencepipelines}" == "true" or "${kserve}" == "true" or "${kueue}" == "true" or "${ray}" == "true" or "${trustyai}" == "true" or "${modelregistry}" == "true" or "${trainingoperator}" == "true" # robocop: disable
301294
Log To Console Waiting for pod status in ${APPLICATIONS_NAMESPACE}
302295
Wait For Pods Status namespace=${APPLICATIONS_NAMESPACE} timeout=200
303296
Log Verified Applications NS: ${APPLICATIONS_NAMESPACE} console=yes

‎ods_ci/test-variables.yml.example‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ COMPONENTS:
7272
dashboard: Managed
7373
datasciencepipelines: Managed
7474
ray: Managed
75-
codeflare: Managed
7675
workbenches: Managed
7776
kserve: Managed
7877
trustyai: Managed

‎ods_ci/tests/Resources/Common.robot‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,21 +182,6 @@ Get RHODS Version
182182
Log Product:${PRODUCT} Version:${RHODS_VERSION} console=yes
183183
RETURN ${RHODS_VERSION}
184184

185-
#robocop: disable: line-too-long
186-
Get CodeFlare Version
187-
[Documentation] Return RHODS CodeFlare operator version number.
188-
... Will fetch version only if $CODEFLARE_VERSION was not already set, or $force_fetch is True.
189-
[Arguments] ${force_fetch}=False
190-
IF "${CODEFLARE_VERSION}" == "${None}" or "${force_fetch}" == "True"
191-
IF "${PRODUCT}" == "${None}" or "${PRODUCT}" == "RHODS"
192-
${CODEFLARE_VERSION}= Run oc get csv -n openshift-operators | grep "rhods-codeflare-operator" | awk '{print $1}' | sed 's/rhods-codeflare-operator.//'
193-
ELSE
194-
${CODEFLARE_VERSION}= Run oc get csv -n openshift-operators | grep "codeflare-operator" | awk -F ' {2,}' '{print $3}'
195-
END
196-
END
197-
Log Product:${PRODUCT} CodeFlare Version:${CODEFLARE_VERSION}
198-
RETURN ${CODEFLARE_VERSION}
199-
200185
Get Cluster ID
201186
[Documentation] Retrieves the ID of the currently connected cluster
202187
${cluster_id}= Run oc get clusterversion -o json | jq .items[].spec.clusterID

‎ods_ci/tests/Resources/Page/ODH/Prometheus/Alerts.resource‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,6 @@ Verify Number Of Alerting Rules
3737
... msg=Number of alerting rules doesn't match, actual '${actual_count}', expected '${expected_count}'
3838

3939
# Grouped checks per rule group
40-
Verify "CodeFlare Operator Probe Success Burn Rate" Alerts Are Not Firing And Continue On Failure
41-
[Documentation] Verifies that alert "CodeFlare Operator Probe Success Burn Rate" is not firing
42-
... for all alert durations
43-
Verify Alert Is Not Firing And Continue On Failure
44-
... SLOs-probe_success_codeflare CodeFlare Operator Probe Success 5m and 1h Burn Rate high alert-duration=120
45-
Verify Alert Is Not Firing And Continue On Failure
46-
... SLOs-probe_success_codeflare CodeFlare Operator Probe Success 30m and 6h Burn Rate high alert-duration=900
47-
Verify Alert Is Not Firing And Continue On Failure
48-
... SLOs-probe_success_codeflare CodeFlare Operator Probe Success 2h and 1d Burn Rate high alert-duration=3600
49-
50-
Verify "Distributed Workloads CodeFlare" Alerts Are Not Firing And Continue On Failure
51-
[Documentation] Verifies that alert "Distributed Workloads CodeFlare" is not firing
52-
Verify Alert Is Not Firing And Continue On Failure
53-
... Distributed Workloads CodeFlare CodeFlare Operator is not running
54-
Verify Alert Is Not Firing And Continue On Failure
55-
... Distributed Workloads CodeFlare CodeFlare Operator taking too long to be up
56-
5740
Verify "KubeFlow Training Operator" Alerts Are Not Firing And Continue On Failure
5841
[Documentation] Verifies that alert "KubeFlow Training Operator" is not firing
5942
Verify Alert Is Not Firing And Continue On Failure

‎ods_ci/tests/Resources/Page/ODH/Prometheus/Triage.resource‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ Documentation Contains Triage URLs Mappings
33
44

55
*** Variables ***
6-
${CODEFLARE_OPERATOR_AVAILABILITY_TRIAGE_URL} https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Distributed-Workloads/codeflare-operator-availability.md
7-
${CODEFLARE_OPERATOR_ABSENT_OVER_TIME_TRIAGE_URL} https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Distributed-Workloads/codeflare-operator-absent-over-time.md
8-
${CODEFLARE_OPERATOR_PROBE_SUCCESS_BURN_RATE_TRIAGE_URL} https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Distributed-Workloads/codeflare-operator-probe-success-burn-rate.md
96
${DSP_APP_COMPONENT_READINESS_STATUS_TRIAGE_URL} https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Data-Science-Pipelines/data-science-pipelines-application-component-readiness-status.md
107
${DSP_APP_ERROR_BURN_RATE_TRIAGE_URL} https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Data-Science-Pipelines/data-science-pipelines-application-error-burn-rate.md
118
${DSP_OPERATOR_PROBE_SUCCESS_BURN_RATE_TRIAGE_URL} https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Data-Science-Pipelines/data-science-pipelines-operator-probe-success-burn-rate.md
@@ -23,10 +20,7 @@ ${NOTEBOOK_PVC_USAGE_TRIAGE_URL} https://gitl
2320
${RHODS_JUPYTER_PROBE_SUCCESS_BURN_RATE_TRIAGE_URL} https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Jupyter/rhods-jupyter-probe-success-burn-rate.md
2421

2522

26-
&{TRIAGE_URLS} CodeFlare Operator is not running=${CODEFLARE_OPERATOR_AVAILABILITY_TRIAGE_URL}
27-
... CodeFlare Operator taking too long to be up=${CODEFLARE_OPERATOR_ABSENT_OVER_TIME_TRIAGE_URL}
28-
... CodeFlare Operator Probe Success.*=${CODEFLARE_OPERATOR_PROBE_SUCCESS_BURN_RATE_TRIAGE_URL}
29-
... Data Science Pipeline.*Unavailable=${DSP_APP_COMPONENT_READINESS_STATUS_TRIAGE_URL}
23+
&{TRIAGE_URLS} Data Science Pipeline.*Unavailable=${DSP_APP_COMPONENT_READINESS_STATUS_TRIAGE_URL}
3024
... Data Science Pipelines Application Route Error.*=${DSP_APP_ERROR_BURN_RATE_TRIAGE_URL}
3125
... Data Science Pipelines Operator Probe Success.*=${DSP_OPERATOR_PROBE_SUCCESS_BURN_RATE_TRIAGE_URL}
3226
... Kserve Controller Probe Success.*=${KSERVE_CONTROLLER_PROBE_SUCCESS_BURN_RATE_TRIAGE_URL}

‎ods_ci/tests/Tests/0100__platform/0101__deploy/0101__installation/0101__post_install.robot‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,6 @@ Verify No Alerts Are Firing After Installation Except For DeadManSnitch # rob
355355
# deadmanssnitch-alerting.rules
356356
Verify Alert Is Firing And Continue On Failure
357357
... DeadManSnitch DeadManSnitch
358-
# codeflare-alerting.rules
359-
Verify "CodeFlare Operator Probe Success Burn Rate" Alerts Are Not Firing And Continue On Failure
360-
Verify "Distributed Workloads CodeFlare" Alerts Are Not Firing And Continue On Failure
361358
# trainingoperator-alerting.rules
362359
Verify "KubeFlow Training Operator" Alerts Are Not Firing And Continue On Failure
363360
# rhods-dashboard-alerting.rules

‎ods_ci/tests/Tests/0100__platform/0101__deploy/0101__installation/0113__installation.robot‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Can Install ODH Operator
2929
Check DW Components Are Enabled By Default
3030
[Documentation] Check that DW Components are enabled by default, can be run for OCP and OSD
3131
[Tags] ODS-2685 Operator OSD
32-
Component Should Be Enabled codeflare
3332
Component Should Be Enabled ray
3433
Component Should Be Enabled kueue
3534
Component Should Be Enabled trainingoperator

‎ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0106__rhods_operatorv2.robot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Suite Teardown Patch DataScienceCluster CustomResource To Original Configurati
1010

1111

1212
*** Variables ***
13-
@{COMPONENTS} = dashboard datasciencepipelines kserve workbenches codeflare ray
13+
@{COMPONENTS} = dashboard datasciencepipelines kserve workbenches ray
1414
${DSC_NAME} = default
1515
${PATCH_PREFIX} = oc patch datasciencecluster ${DSC_NAME} --type='merge' -p '{"spec": {"components": {
1616
@{ORIGINAL_CONFIGURATION}

‎ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ ${KNATIVE_SERVING_NS} knative-serving
1818
${DSC_NAME} default-dsc
1919
${KUEUE_LABEL_SELECTOR} app.kubernetes.io/name=kueue
2020
${KUEUE_DEPLOYMENT_NAME} kueue-controller-manager
21-
${CODEFLARE_LABEL_SELECTOR} app.kubernetes.io/name=codeflare-operator
22-
${CODEFLARE_DEPLOYMENT_NAME} codeflare-operator-manager
2321
${RAY_LABEL_SELECTOR} app.kubernetes.io/name=kuberay
2422
${RAY_DEPLOYMENT_NAME} kuberay-operator
2523
${TRAINING_LABEL_SELECTOR} app.kubernetes.io/name=training-operator
@@ -45,7 +43,6 @@ ${IS_NOT_PRESENT} 1
4543
&{SAVED_MANAGEMENT_STATES}
4644
... RAY=${EMPTY}
4745
... KUEUE=${EMPTY}
48-
... CODEFLARE=${EMPTY}
4946
... TRAINING=${EMPTY}
5047
... DASHBOARD=${EMPTY}
5148
... DATASCIENCEPIPELINES=${EMPTY}
@@ -57,7 +54,6 @@ ${IS_NOT_PRESENT} 1
5754
... LLAMASTACKOPERATOR=${EMPTY}
5855

5956
@{CONTROLLERS_LIST} # dashboard added in Suite Setup, since it's different in RHOAI vs ODH
60-
... codeflare-operator-manager
6157
... data-science-pipelines-operator-controller-manager
6258
... kuberay-operator
6359
#... kueue-controller-manager # RHOAIENG-34529
@@ -127,40 +123,6 @@ Validate Kueue Unmanaged To Removed State Transition
127123

128124
[Teardown] Restore Kueue Initial State
129125

130-
Validate Codeflare Managed State
131-
[Documentation] Validate that the DSC Codeflare component Managed state creates the expected resources,
132-
... check that Codeflare deployment is created and pod is in Ready state
133-
[Tags]
134-
... Operator
135-
... Tier1
136-
... RHOAIENG-5435
137-
... codeflare-managed
138-
... Integration
139-
... RHOAIENG-24666
140-
Set DSC Component Managed State And Wait For Completion
141-
... codeflare
142-
... ${CODEFLARE_DEPLOYMENT_NAME}
143-
... ${CODEFLARE_LABEL_SELECTOR}
144-
Check That Image Pull Path Is Correct ${CODEFLARE_DEPLOYMENT_NAME} ${IMAGE_PULL_PATH}
145-
146-
[Teardown] Restore DSC Component State codeflare ${CODEFLARE_DEPLOYMENT_NAME} ${CODEFLARE_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.CODEFLARE}
147-
148-
Validate Codeflare Removed State
149-
[Documentation] Validate that Codeflare management state Removed does remove relevant resources.
150-
[Tags]
151-
... Operator
152-
... Tier1
153-
... RHOAIENG-5435
154-
... codeflare-removed
155-
... Integration
156-
157-
Set DSC Component Removed State And Wait For Completion
158-
... codeflare
159-
... ${CODEFLARE_DEPLOYMENT_NAME}
160-
... ${CODEFLARE_LABEL_SELECTOR}
161-
162-
[Teardown] Restore DSC Component State codeflare ${CODEFLARE_DEPLOYMENT_NAME} ${CODEFLARE_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.CODEFLARE}
163-
164126
Validate Ray Managed State
165127
[Documentation] Validate that the DSC Ray component Managed state creates the expected resources,
166128
... check that Ray deployment is created and pod is in Ready state
@@ -577,7 +539,6 @@ Suite Setup
577539
Wait For DSC Ready State ${OPERATOR_NS} ${DSC_NAME}
578540
${SAVED_MANAGEMENT_STATES.RAY}= Get DSC Component State ${DSC_NAME} ray ${OPERATOR_NS}
579541
${SAVED_MANAGEMENT_STATES.KUEUE}= Get DSC Component State ${DSC_NAME} kueue ${OPERATOR_NS}
580-
${SAVED_MANAGEMENT_STATES.CODEFLARE}= Get DSC Component State ${DSC_NAME} codeflare ${OPERATOR_NS}
581542
${SAVED_MANAGEMENT_STATES.TRAINING}= Get DSC Component State ${DSC_NAME} trainingoperator ${OPERATOR_NS}
582543
${SAVED_MANAGEMENT_STATES.DASHBOARD}= Get DSC Component State ${DSC_NAME} dashboard ${OPERATOR_NS}
583544
${SAVED_MANAGEMENT_STATES.DATASCIENCEPIPELINES}= Get DSC Component State ${DSC_NAME} datasciencepipelines ${OPERATOR_NS}

0 commit comments

Comments
 (0)