From f56005719c8fe81a366c52d49d905fb84de8cfd1 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 16 Oct 2023 07:57:56 +0000 Subject: [PATCH] test: don't return error in blob_log.sh --- Makefile | 2 +- test/utils/blob_log.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b56c10fd..98e740088 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ blob-darwin: .PHONY: container container: blob - docker build -t $(CSI_IMAGE_TAG) --output=type=docker -f ./pkg/blobplugin/Dockerfile . + docker build -t $(CSI_IMAGE_TAG) --build-arg ARCH=$(ARCH) --output=type=docker -f ./pkg/blobplugin/Dockerfile . .PHONY: container-linux container-linux: diff --git a/test/utils/blob_log.sh b/test/utils/blob_log.sh index 87b995ac1..14a6725cd 100755 --- a/test/utils/blob_log.sh +++ b/test/utils/blob_log.sh @@ -23,6 +23,13 @@ if [[ "$#" -gt 0 ]]; then DRIVER=$1 fi +cleanup() { + echo "hit unexpected error during log print, exit 0" + exit 0 +} + +trap cleanup ERR + echo "print out all nodes status ..." kubectl get nodes -o wide echo "======================================================================================"