Merge pull request #511 from Jooho/cp_9b9b9ff63

[Cherry-pick] enhance e2e test stability

Author: Jooho

config/runtimes/kserve-tensorflow-serving.yaml

@@ -29,7 +29,8 @@ spec:
         - --model_base_path=/mnt/models
         - --rest_api_timeout_in_ms=60000
       securityContext:
-        runAsUser: 1000    # User is not defined in the Dockerfile, so we need to set it here to run as non-root
+        # In OpenShift, the UID is automatically assigned by the platform, so comment this field not to interfere with E2E tests.
+        # runAsUser: 1000    # User is not defined in the Dockerfile, so we need to set it here to run as non-root
         allowPrivilegeEscalation: false
         privileged: false
         runAsNonRoot: true

test/scripts/openshift-ci/run-e2e-tests.sh

@@ -25,8 +25,9 @@ set -o pipefail
 MY_PATH=$(dirname "$0")
 PROJECT_ROOT=$MY_PATH/../../../
 
-SETUP_E2E=true
-if $SETUP_E2E; then
+: "${SETUP_E2E:=true}"
+
+if [ "$SETUP_E2E" = "true" ]; then
   echo "Installing on cluster"
   pushd $PROJECT_ROOT >/dev/null
   ./test/scripts/openshift-ci/setup-e2e-tests.sh "$1"

test/scripts/openshift-ci/setup-e2e-tests.sh

@@ -113,6 +113,7 @@ if [ "$1" != "raw" ]; then
     oc create -f -
 
   oc apply -k $PROJECT_ROOT/test/scripts/openshift-ci
+  oc wait --for=condition=ready pod -l app=odh-model-controller -n kserve --timeout=300s
 fi
 
 echo "Add testing models to minio storage ..." # Reference: config/overlays/test/minio/minio-init-job.yaml