From 118373aa4d9ca233a7e392b4f34fc8b986e7ba44 Mon Sep 17 00:00:00 2001 From: Hannah DeFazio Date: Mon, 10 Feb 2025 20:02:58 -0500 Subject: [PATCH 1/2] Fix typo in sed command --- test/scripts/openshift-ci/setup-e2e-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/openshift-ci/setup-e2e-tests.sh b/test/scripts/openshift-ci/setup-e2e-tests.sh index 3c7b7e7184e..4e74c35929e 100755 --- a/test/scripts/openshift-ci/setup-e2e-tests.sh +++ b/test/scripts/openshift-ci/setup-e2e-tests.sh @@ -98,7 +98,7 @@ oc wait --for=condition=ready pod -l control-plane=kserve-controller-manager -n if [ "$1" != "raw" ]; then echo "Installing odh-model-controller" # authorino - curl -sL https://raw.githubusercontent.com/Kuadrant/authorino-operator/main/utils/install.sh | "s|kubectl|oc|" | + curl -sL https://raw.githubusercontent.com/Kuadrant/authorino-operator/main/utils/install.sh | sed "s|kubectl|oc|" | bash -s -- -v 0.16.0 # kserve-local-gateway From cb98a7981fd5f0533a935b6392cae9d9471e6a0e Mon Sep 17 00:00:00 2001 From: Hannah DeFazio Date: Tue, 11 Feb 2025 12:25:02 -0500 Subject: [PATCH 2/2] Add shell options to error --- test/scripts/openshift-ci/run-e2e-tests.sh | 4 ++++ test/scripts/openshift-ci/setup-e2e-tests.sh | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/scripts/openshift-ci/run-e2e-tests.sh b/test/scripts/openshift-ci/run-e2e-tests.sh index a5be2436359..f021d6d6db3 100755 --- a/test/scripts/openshift-ci/run-e2e-tests.sh +++ b/test/scripts/openshift-ci/run-e2e-tests.sh @@ -18,6 +18,10 @@ # like kustomize and the mc client are installed by the script if not available. # The oc CLI is assumed to be configured with the credentials of the # target cluster. The target cluster is assumed to be a clean cluster. +set -o errexit +set -o nounset +set -o pipefail + MY_PATH=$(dirname "$0") PROJECT_ROOT=$MY_PATH/../../../ diff --git a/test/scripts/openshift-ci/setup-e2e-tests.sh b/test/scripts/openshift-ci/setup-e2e-tests.sh index 4e74c35929e..4a30c8df39d 100755 --- a/test/scripts/openshift-ci/setup-e2e-tests.sh +++ b/test/scripts/openshift-ci/setup-e2e-tests.sh @@ -18,7 +18,9 @@ # like kustomize and the mc client are installed by the script if not available. # The oc CLI is assumed to be configured with the credentials of the # target cluster. The target cluster is assumed to be a clean cluster. -set -eu +set -o errexit +set -o nounset +set -o pipefail : "${SKLEARN_IMAGE:=kserve/sklearnserver:latest}" : "${KSERVE_CONTROLLER_IMAGE:=quay.io/opendatahub/kserve-controller:latest}"