Skip to content

Commit c96512a

Browse files
authored
Merge pull request #1056 from k8s-infra-cherrypick-robot/cherry-pick-1054-to-release-1.23
[release-1.23] test: don't return error in blob_log.sh
2 parents d50624f + 0bc94a6 commit c96512a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ blob-darwin:
117117

118118
.PHONY: container
119119
container: blob
120-
docker build -t $(CSI_IMAGE_TAG) --output=type=docker -f ./pkg/blobplugin/Dockerfile .
120+
docker build -t $(CSI_IMAGE_TAG) --build-arg ARCH=$(ARCH) --output=type=docker -f ./pkg/blobplugin/Dockerfile .
121121

122122
.PHONY: container-linux
123123
container-linux:

test/utils/blob_log.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ if [[ "$#" -gt 0 ]]; then
2323
DRIVER=$1
2424
fi
2525

26+
cleanup() {
27+
echo "hit unexpected error during log print, exit 0"
28+
exit 0
29+
}
30+
31+
trap cleanup ERR
32+
2633
echo "print out all nodes status ..."
2734
kubectl get nodes -o wide
2835
echo "======================================================================================"

0 commit comments

Comments
 (0)