[test] fix variable overriding (kubeflow#743)

rename the variable in the script to avoid using the variable in
the build.properties
also add more time for waiting the kfp-tekton deployment

Signed-off-by: Yihong Wang <yh.wang@ibm.com>

scripts/deploy/iks/deploy-kfp.sh

@@ -22,7 +22,7 @@ set -ex
 # - KUBEFLOW_NS:                        namespace for kfp-tekton, defulat: kubeflow
 
 MAX_RETRIES="${MAX_RETRIES:-5}"
-SLEEP_TIME="${SLEEP_TIME:-10}"
+SLEEP_TIME="${SLEEP_TIME:-20}"
 EXIT_CODE=0
 
 KUSTOMIZE_DIR="${KUSTOMIZE_DIR:-"manifests/kustomize/env/platform-agnostic"}"

scripts/deploy/iks/tekton-catalog/setup-kubectl-wrapper-deploy.sh

@@ -20,14 +20,12 @@ KUBECTL_WRAPPER_IMAGE_URL="${KUBECTL_WRAPPER_IMAGE_URL:=docker.io/aipipeline/kub
 IMAGE_TAG="${IMAGE_TAG:=nightly}"
 
 BUILD_DIR="sdk/python/tests/compiler/testdata"
-MANIFEST="${MANIFEST:="resourceop_basic.yaml"}"
-
-pushd $BUILD_DIR > /dev/null
+RESOURCE_MANIFEST="${RESOURCE_MANIFEST:="resourceop_basic.yaml"}" pushd $BUILD_DIR > /dev/null
 
 # Ensure image fields exists
-yq eval --exit-status '.spec.pipelineSpec.tasks[0].taskSpec.params[] | select(.name == "image") | .default' $MANIFEST
+yq eval --exit-status '.spec.pipelineSpec.tasks[0].taskSpec.params[] | select(.name == "image") | .default' $RESOURCE_MANIFEST
 
 # Replace images inplace
-yq eval --inplace ''".spec.pipelineSpec.tasks[0].taskSpec.params[] |= select(.name == \"image\") |= .default = \"$KUBECTL_WRAPPER_IMAGE_URL:$IMAGE_TAG\""'' $MANIFEST
+yq eval --inplace ''".spec.pipelineSpec.tasks[0].taskSpec.params[] |= select(.name == \"image\") |= .default = \"$KUBECTL_WRAPPER_IMAGE_URL:$IMAGE_TAG\""'' $RESOURCE_MANIFEST
 
 popd > /dev/null