Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#1054 from andyzhangx/fix-blob-log-…
Browse files Browse the repository at this point in the history
…error

test: don't return error in blob_log.sh
  • Loading branch information
andyzhangx authored Oct 16, 2023
2 parents a9c9291 + 13aefef commit 39d6d04
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions test/utils/blob_log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "======================================================================================"
Expand Down

0 comments on commit 39d6d04

Please sign in to comment.