From a7ebfbe49aa33ced19dce6f6a730422b66413325 Mon Sep 17 00:00:00 2001 From: Hannah DeFazio Date: Mon, 2 Dec 2024 11:30:46 -0500 Subject: [PATCH 1/2] Use odh-model-controller incubating branch (#443) --- test/scripts/openshift-ci/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/scripts/openshift-ci/kustomization.yaml b/test/scripts/openshift-ci/kustomization.yaml index 4b9775d24ac..4dca7317eec 100644 --- 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 \ No newline at end of file +namespace: kserve From 8198b204407b5ea96fccda7ed34f8b7a8920b410 Mon Sep 17 00:00:00 2001 From: jooho lee Date: Wed, 4 Dec 2024 14:35:11 -0500 Subject: [PATCH 2/2] seprate creating dsc/dsci objects part from kustomization for e2e test to avoid timing issue Signed-off-by: jooho lee --- test/scripts/openshift-ci/run-e2e-tests.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/scripts/openshift-ci/run-e2e-tests.sh b/test/scripts/openshift-ci/run-e2e-tests.sh index 85497b7816b..02d2ec9b8f4 100755 --- a/test/scripts/openshift-ci/run-e2e-tests.sh +++ b/test/scripts/openshift-ci/run-e2e-tests.sh @@ -78,6 +78,10 @@ kustomize build $PROJECT_ROOT/config/overlays/test | \ sed "s|kserve/kserve-controller:latest|${KSERVE_CONTROLLER_IMAGE}|" | \ oc apply -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}')