Synced the master branch to the release branch for ODH release v2.22 (#…

…450) * Use odh-model-controller incubating branch (#443) * seprate creating dsc/dsci objects part from kustomization for e2e test to avoid timing issue Signed-off-by: jooho lee <[email protected]> --------- Signed-off-by: jooho lee <[email protected]> Co-authored-by: Hannah DeFazio <[email protected]> Co-authored-by: jooho lee <[email protected]>
opendatahub-io · Dec 6, 2024 · 35db95a · 35db95a
1 parent 8efd3c8
commit 35db95a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/test/scripts/openshift-ci/kustomization.yaml b/test/scripts/openshift-ci/kustomization.yaml
@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - github.com/opendatahub-io/odh-model-controller/config/base?ref=main
+  - github.com/opendatahub-io/odh-model-controller/config/base?ref=incubating
 
-namespace: kserve
+namespace: kserve
diff --git a/test/scripts/openshift-ci/run-e2e-tests.sh b/test/scripts/openshift-ci/run-e2e-tests.sh
@@ -77,6 +77,10 @@ kustomize build $PROJECT_ROOT/config/overlays/test |
   sed "s|kserve/kserve-controller:latest|${KSERVE_CONTROLLER_IMAGE}|" |
   oc apply --server-side=true -f -
 
+# Install DSC/DSCI for test. (sometimes there is timing issue when it is under the same kustomization so it is separated)
+oc create -f config/overlays/test/dsci.yaml
+oc create -f config/overlays/test/dsc.yaml
+
 # Patch the inferenceservice-config ConfigMap, when running RawDeployment tests
 if [ "$1" == "raw" ]; then
   export OPENSHIFT_INGRESS_DOMAIN=$(oc get ingresses.config cluster -o jsonpath='{.spec.domain}')