diff --git a/ci/openshift-ci/cleanup.sh b/ci/openshift-ci/cleanup.sh index af27ec1b4..b05a3f98f 100755 --- a/ci/openshift-ci/cleanup.sh +++ b/ci/openshift-ci/cleanup.sh @@ -52,8 +52,7 @@ echo "Wait for all related pods to be gone" oc get pods -l name="kubelet-kata-cleanup" --no-headers=true -n kube-system 2>&1 | grep "No resources found" -q && ((repeats++)) || repeats=1 [ "$repeats" -gt 5 ] && echo kata-cleanup finished && break sleep 1 -done) || { echo "There are still some kata-cleanup related pods after 600 iterations"; oc get all -n kube-system; exit -1; } +done) || { echo "There are still some kata-cleanup related pods after 600 iterations"; oc get all -n kube-system; exit 1; } oc delete -f kata-cleanup/base/kata-cleanup.yaml oc delete -f kata-rbac/base/kata-rbac.yaml oc delete -f runtimeclasses/kata-runtimeClasses.yaml - diff --git a/ci/openshift-ci/cluster/install_kata.sh b/ci/openshift-ci/cluster/install_kata.sh index 0c7e636df..8e5d8cd13 100755 --- a/ci/openshift-ci/cluster/install_kata.sh +++ b/ci/openshift-ci/cluster/install_kata.sh @@ -178,7 +178,7 @@ wait_for_app_pods_message() { [ "${#pods}" -ge "$pod_count" ] && break if [ "$SECONDS" -gt "$timeout" ]; then printf "Unable to find ${pod_count} pods for '-l app=\"$app\"' in ${SECONDS}s (%s)" "${pods[@]}" - return -1 + return 1 fi done for pod in "${pods[@]}"; do @@ -190,7 +190,7 @@ wait_for_app_pods_message() { printf "pods after ${SECONDS}s :(%s)\n" "${pods[@]}" echo "Pod $pod's output so far:" echo "$log" - return -1 + return 1 fi sleep 1; done diff --git a/tools/osbuilder/dockerfiles/QAT/run.sh b/tools/osbuilder/dockerfiles/QAT/run.sh index c7363fa26..539997e68 100755 --- a/tools/osbuilder/dockerfiles/QAT/run.sh +++ b/tools/osbuilder/dockerfiles/QAT/run.sh @@ -137,7 +137,7 @@ main() if [ -z "${check_in_container}" ]; then echo "Error: 'OUTPUT_DIR' not set" >&2 echo "$0 should be run using the Dockerfile supplied." >&2 - exit -1 + exit 1 fi local OPTIND @@ -154,7 +154,7 @@ main() # parse failure help echo "ERROR: Failed to parse arguments" - exit -1 + exit 1 ;; esac done