From 51d152e848a36199a3057b7b88fc36772cf12992 Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Wed, 11 Oct 2023 13:45:24 +0000
Subject: [PATCH 1/3] test: adjust log print in e2e test

disable error exit

test: fix blob_log.sh
---
 test/utils/blob_log.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/utils/blob_log.sh b/test/utils/blob_log.sh
index 3ba0039e0..bd0268b63 100755
--- a/test/utils/blob_log.sh
+++ b/test/utils/blob_log.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e
+# set -e
 
 NS=kube-system
 CONTAINER=blob
@@ -49,11 +49,6 @@ kubectl get pods -n${NS} -l${LABEL} \
     | awk 'NR>1 {print $1}' \
     | xargs -I {} kubectl logs {} --prefix -c${CONTAINER} -n${NS}
 
-echo "print out cloudprovider_azure metrics ..."
-echo "======================================================================================"
-ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
-curl http://$ip:29634/metrics
-
 if [ -n "$ENABLE_BLOBFUSE_PROXY" ]; then
     echo "print out install-blobfuse-proxy logs ..."
     echo "======================================================================================"
@@ -64,4 +59,12 @@ if [ -n "$ENABLE_BLOBFUSE_PROXY" ]; then
         | xargs -I {} kubectl logs {} --prefix -c${PROXY} -n${NS}
 fi
 
-
+echo "======================================================================================"
+ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
+if [ -n "$ip" ]; then
+    echo "print out cloudprovider_azure metrics ..."
+    curl http://$ip:29634/metrics
+else
+    echo "csi-$DRIVER-controller service ip is empty"
+    kubectl get svc csi-$DRIVER-controller -n kube-system
+fi

From 9db3c7db85d271742fcbd0ba56d51837634d71fb Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Thu, 12 Oct 2023 11:17:41 +0000
Subject: [PATCH 2/3] test: fix external e2e test

---
 test/external-e2e/testdriver-blobfuse.yaml | 4 ++--
 test/external-e2e/testdriver-nfs.yaml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/external-e2e/testdriver-blobfuse.yaml b/test/external-e2e/testdriver-blobfuse.yaml
index bd67c3246..d1ee6a017 100644
--- a/test/external-e2e/testdriver-blobfuse.yaml
+++ b/test/external-e2e/testdriver-blobfuse.yaml
@@ -5,7 +5,7 @@ ShortName: blobfuse
 StorageClass:
   FromFile: /tmp/csi/storageclass.yaml
 DriverInfo:
-  Name: test.csi.azure.com
+  Name: blob.csi.azure.com
   Capabilities:
     persistence: true
     exec: true
@@ -16,4 +16,4 @@ DriverInfo:
     controllerExpansion: true
     nodeExpansion: true
     volumeLimits: false
-    snapshotDataSource: false
\ No newline at end of file
+    snapshotDataSource: false
diff --git a/test/external-e2e/testdriver-nfs.yaml b/test/external-e2e/testdriver-nfs.yaml
index a26a3d432..2bbfa33b5 100644
--- a/test/external-e2e/testdriver-nfs.yaml
+++ b/test/external-e2e/testdriver-nfs.yaml
@@ -5,7 +5,7 @@ ShortName: blobfuse
 StorageClass:
   FromFile: /tmp/csi/storageclass.yaml
 DriverInfo:
-  Name: test.csi.azure.com
+  Name: blob.csi.azure.com
   Capabilities:
     persistence: true
     exec: true

From b5f65f2ba2d1ad32b4c1ba4faa43136d8112a070 Mon Sep 17 00:00:00 2001
From: andyzhangx <xiazhang@microsoft.com>
Date: Fri, 13 Oct 2023 03:11:57 +0000
Subject: [PATCH 3/3] test: fix test failures

---
 hack/verify-examples.sh | 3 ---
 test/utils/blob_log.sh  | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/hack/verify-examples.sh b/hack/verify-examples.sh
index 5174da809..a84e059e7 100755
--- a/hack/verify-examples.sh
+++ b/hack/verify-examples.sh
@@ -42,9 +42,6 @@ EXAMPLES=(\
     deploy/example/deployment.yaml \
     deploy/example/statefulset.yaml \
     deploy/example/statefulset-nonroot.yaml \
-    deploy/example/deployment-nfs.yaml \
-    deploy/example/statefulset-nfs.yaml \
-    deploy/example/statefulset-nonroot-nfs.yaml \
 )
 
 for EXAMPLE in "${EXAMPLES[@]}"; do
diff --git a/test/utils/blob_log.sh b/test/utils/blob_log.sh
index bd0268b63..482220c8e 100755
--- a/test/utils/blob_log.sh
+++ b/test/utils/blob_log.sh
@@ -61,7 +61,7 @@ fi
 
 echo "======================================================================================"
 ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
-if [ -n "$ip" ]; then
+if echo "$ip" | grep -q "\."; then
     echo "print out cloudprovider_azure metrics ..."
     curl http://$ip:29634/metrics
 else