Skip to content

Commit a8f0bce

Browse files
authored
fix installation method for lws operator (#2689)
2 parents 71fb1fb + 5ea085e commit a8f0bce

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,13 +627,14 @@ Install Leader Worker Set Operator Via Cli
627627
[Documentation] Install Leader Worker Set Operator Via CLI
628628
${is_installed} = Check If Operator Is Installed Via CLI ${LWS_OP_NAME}
629629
IF not ${is_installed}
630+
${rc} ${out} = Run And Return Rc And Output oc create namespace ${LWS_OP_NS}
630631
Install ISV Operator From OperatorHub Via CLI operator_name=${LWS_OP_NAME}
631632
... subscription_name=${LWS_SUB_NAME}
632633
... namespace=${LWS_OP_NS}
633634
... catalog_source_name=redhat-operators
634635
... operator_group_name=openshift-lws-operator
635636
... operator_group_ns=${LWS_OP_NS}
636-
... operator_group_target_ns=${NONE}
637+
... operator_group_target_ns=${LWS_OP_NS}
637638
... channel=${LWS_CHANNEL_NAME}
638639
Wait Until Operator Subscription Last Condition Is
639640
... type=CatalogSourcesUnhealthy status=False

ods_ci/tests/Resources/Files/isv-operator-subscription.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ spec:
88
installPlanApproval: Automatic
99
name: <OPERATOR_NAME>
1010
source: <CATALOG_SOURCE>
11-
sourceNamespace: <CS_NAMESPACE>
11+
sourceNamespace: <CS_NAMESPACE>

ods_ci/tests/Resources/Page/Operators/ISVs.resource

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Install ISV Operator From OperatorHub Via CLI # robocop: disable
3535
${rc} ${out}= Run And Return Rc And Output sed -i'' -e "s/<OPERATOR_NAME>/${operator_name}/g" ${operator_sub_filepath} # robocop: disable
3636
${rc} ${out}= Run And Return Rc And Output sed -i'' -e "s/<CATALOG_SOURCE>/${catalog_source_name}/g" ${operator_sub_filepath} # robocop: disable
3737
${rc} ${out}= Run And Return Rc And Output sed -i'' -e "s/<CS_NAMESPACE>/${cs_namespace}/g" ${operator_sub_filepath} # robocop: disable
38-
Oc Apply kind=Subscription src=${operator_sub_filepath}
38+
${return_code} ${output} = Run And Return Rc And Output oc apply -f ${operator_sub_filepath}
39+
Log To Console ${output}
3940
# TODO: Remove this once the operator_name will be tempo-operator
4041
IF "${operator_name}" == "tempo-product"
4142
${operator_name}= Set Variable tempo-operator

0 commit comments

Comments
 (0)