Skip to content

Commit 77a4a34

Browse files
committed
revert dependent operators removal
1 parent 1b5a788 commit 77a4a34

File tree

1 file changed

+58
-0
lines changed

1 file changed

+58
-0
lines changed

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ ${DSCI_NAME} = default-dsci
2121
... modelregistry
2222
... feastoperator
2323
... llamastackoperator
24+
${SERVERLESS_OP_NAME}= serverless-operator
25+
${SERVERLESS_SUB_NAME}= serverless-operator
26+
${SERVERLESS_NS}= openshift-serverless
27+
${SERVICEMESH_OP_NAME}= servicemeshoperator
28+
${SERVICEMESH_SUB_NAME}= servicemeshoperator
2429
${OPENSHIFT_OPERATORS_NS}= openshift-operators
2530
${COMMUNITY_OPERATORS_NS}= openshift-marketplace
2631
${COMMUNITY_OPERATORS_CS}= community-operators
@@ -78,6 +83,7 @@ Install RHODS
7883
Log Start installing RHOAI with:\n\- cluster type: ${cluster_type}\n\- image_url: ${image_url}\n\- update_channel: ${UPDATE_CHANNEL} console=yes #robocop:disable
7984
Log \- rhoai_version: ${rhoai_version}\n\- is_upgrade: ${is_upgrade}\n\- install_plan_approval: ${install_plan_approval}\n\- CATALOG_SOURCE: ${CATALOG_SOURCE} console=yes #robocop:disable
8085
Assign Vars According To Product
86+
Install Rhoai Dependencies
8187
${enable_new_observability_stack} = Is New Observability Stack Enabled
8288
IF ${enable_new_observability_stack}
8389
Install Observability Dependencies
@@ -668,6 +674,58 @@ Install Kueue Dependencies
668674
Install Cert Manager Operator Via Cli
669675
Install Kueue Operator Via Cli
670676

677+
Install Service Mesh Operator Via Cli
678+
[Documentation] Install Service Mesh Operator Via CLI
679+
${is_installed} = Check If Operator Is Installed Via CLI ${SERVICEMESH_OP_NAME}
680+
IF not ${is_installed}
681+
Install ISV Operator From OperatorHub Via CLI operator_name=${SERVICEMESH_OP_NAME}
682+
... subscription_name=${SERVICEMESH_SUB_NAME}
683+
... catalog_source_name=redhat-operators
684+
Wait Until Operator Subscription Last Condition Is
685+
... type=CatalogSourcesUnhealthy status=False
686+
... reason=AllCatalogSourcesHealthy subcription_name=${SERVICEMESH_SUB_NAME}
687+
... retry=150
688+
Wait For Pods To Be Ready label_selector=name=istio-operator
689+
... namespace=${OPENSHIFT_OPERATORS_NS}
690+
ELSE
691+
Log To Console message=Service Mesh Operator is already installed
692+
END
693+
694+
Install Serverless Operator Via Cli
695+
[Documentation] Install Serverless Operator Via CLI
696+
${is_installed} = Check If Operator Is Installed Via CLI ${SERVERLESS_OP_NAME}
697+
IF not ${is_installed}
698+
${rc} ${out} = Run And Return Rc And Output oc create namespace ${SERVERLESS_NS}
699+
Install ISV Operator From OperatorHub Via CLI operator_name=${SERVERLESS_OP_NAME}
700+
... namespace=${SERVERLESS_NS}
701+
... subscription_name=${SERVERLESS_SUB_NAME}
702+
... catalog_source_name=redhat-operators
703+
... operator_group_name=serverless-operators
704+
... operator_group_ns=${SERVERLESS_NS}
705+
... operator_group_target_ns=${NONE}
706+
Wait Until Operator Subscription Last Condition Is
707+
... type=CatalogSourcesUnhealthy status=False
708+
... reason=AllCatalogSourcesHealthy subcription_name=${SERVERLESS_SUB_NAME}
709+
... namespace=${SERVERLESS_NS}
710+
... retry=150
711+
Wait For Pods To Be Ready label_selector=name=knative-openshift
712+
... namespace=${SERVERLESS_NS}
713+
Wait For Pods To Be Ready label_selector=name=knative-openshift-ingress
714+
... namespace=${SERVERLESS_NS}
715+
Wait For Pods To Be Ready label_selector=name=knative-operator
716+
... namespace=${SERVERLESS_NS}
717+
ELSE
718+
Log To Console message=Serverless Operator is already installed
719+
END
720+
721+
Install Rhoai Dependencies
722+
[Documentation] Install Dependent Operators For Rhoai
723+
Set Suite Variable ${FILES_RESOURCES_DIRPATH} tests/Resources/Files
724+
Set Suite Variable ${SUBSCRIPTION_YAML_TEMPLATE_FILEPATH} ${FILES_RESOURCES_DIRPATH}/isv-operator-subscription.yaml
725+
Set Suite Variable ${OPERATORGROUP_YAML_TEMPLATE_FILEPATH} ${FILES_RESOURCES_DIRPATH}/isv-operator-group.yaml
726+
Install Service Mesh Operator Via Cli
727+
Install Serverless Operator Via Cli
728+
671729
Install Cluster Observability Operator Via Cli
672730
[Documentation] Install Cluster Observability Operator Via CLI
673731
${is_installed} = Check If Operator Is Installed Via CLI ${CLUSTER_OBS_OP_NAME}

0 commit comments

Comments
 (0)