diff --git a/ods_ci/tasks/Resources/Files/dsc_template.yml b/ods_ci/tasks/Resources/Files/dsc_template.yml index 973b951da..ec1a0b2fc 100644 --- a/ods_ci/tasks/Resources/Files/dsc_template.yml +++ b/ods_ci/tasks/Resources/Files/dsc_template.yml @@ -35,4 +35,8 @@ spec: workbenches: devFlags: managementState: + modelregistry: + devFlags: + managementState: + registriesNamespace: diff --git a/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot b/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot index 597656e0b..c3381b73f 100644 --- a/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot +++ b/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot @@ -19,6 +19,7 @@ ${DSCI_NAME} = default-dsci ... trainingoperator ... trustyai ... workbenches +... modelregistry ${SERVERLESS_OP_NAME}= serverless-operator ${SERVERLESS_SUB_NAME}= serverless-operator ${SERVERLESS_NS}= openshift-serverless @@ -316,6 +317,11 @@ Create DataScienceCluster CustomResource Using Test Variables ELSE IF '${COMPONENTS.${cmp}}' == 'Removed' Run sed -i'' -e 's/<${cmp}_value>/Removed/' ${file_path}dsc_apply.yml END + + # The model registry component needs to set the namespace used, so adding this special statement just for it + IF '${cmp}' == 'modelregistry' + Run sed -i'' -e 's/<${cmp}_namespace>/${MODEL_REGISTRY_NAMESPACE}/' ${file_path}dsc_apply.yml + END END Apply Custom Manifest in DataScienceCluster CustomResource Using Test Variables diff --git a/ods_ci/tasks/Tasks/rhods_olm.robot b/ods_ci/tasks/Tasks/rhods_olm.robot index 354934417..7f86548e6 100644 --- a/ods_ci/tasks/Tasks/rhods_olm.robot +++ b/ods_ci/tasks/Tasks/rhods_olm.robot @@ -24,6 +24,7 @@ Can Install RHODS Operator IF "${PRODUCT}" == "ODH" Set Global Variable ${OPERATOR_NAMESPACE} opendatahub-operators Set Global Variable ${OPERATOR_NAME_LABEL} opendatahub-operator + Set Global Variable ${MODEL_REGISTRY_NAMESPACE} odh-model-registries IF "${UPDATE_CHANNEL}" == "odh-nightlies" Set Global Variable ${OPERATOR_NAME} rhods-operator ELSE @@ -32,6 +33,7 @@ Can Install RHODS Operator ELSE Set Global Variable ${OPERATOR_NAME} rhods-operator Set Global Variable ${OPERATOR_NAME_LABEL} rhods-operator + Set Global Variable ${MODEL_REGISTRY_NAMESPACE} rhoai-model-registries END Given Selected Cluster Type ${cluster_type} When Installing RHODS Operator ${image_url} diff --git a/ods_ci/tests/Resources/RHOSi.resource b/ods_ci/tests/Resources/RHOSi.resource index 9b39d3129..1f87766d5 100644 --- a/ods_ci/tests/Resources/RHOSi.resource +++ b/ods_ci/tests/Resources/RHOSi.resource @@ -105,6 +105,7 @@ Assign Vars According To Product Set Suite Variable ${DASHBOARD_DEPLOYMENT_NAME} rhods-dashboard Set Suite Variable ${DASHBOARD_LABEL_SELECTOR} app.kubernetes.io/part-of=rhods-dashboard Set Suite Variable ${APPLICATIONS_NAMESPACE} redhat-ods-applications + Set Suite Variable ${MODEL_REGISTRY_NAMESPACE} rhoai-model-registries ELSE IF "${PRODUCT}" == "ODH" Set Suite Variable ${OPERATOR_APPNAME} Open Data Hub Operator Set Suite Variable ${OPERATOR_NAME} Open Data Hub Operator @@ -116,6 +117,7 @@ Assign Vars According To Product Set Suite Variable ${DASHBOARD_DEPLOYMENT_NAME} odh-dashboard Set Suite Variable ${DASHBOARD_LABEL_SELECTOR} app.kubernetes.io/part-of=dashboard Set Suite Variable ${APPLICATIONS_NAMESPACE} opendatahub + Set Suite Variable ${MODEL_REGISTRY_NAMESPACE} odh-model-registries END Gather Release Attributes From DSC And DSCI