test: refine verify-examples.sh

fix test failure

Author: andyzhangx

hack/verify-examples.sh

@@ -15,24 +15,33 @@
 
 set -euo pipefail
 
+rollout_and_wait() {
+    echo "Applying config \"$1\""
+    trap "echo \"Failed to apply config \\\"$1\\\"\" >&2" err
+
+    APPNAME=$(kubectl apply -f $1 | grep -E "^(:?daemonset|deployment|statefulset|pod)" | awk '{printf $1}')
+    if [[ -n $(expr "${APPNAME}" : "\(daemonset\|deployment\|statefulset\)" || true) ]]; then
+        kubectl rollout status $APPNAME --watch --timeout=5m
+    else
+        kubectl wait "${APPNAME}" --for condition=ready --timeout=5m
+    fi
+}
+
 echo "begin to create deployment examples ..."
 kubectl apply -f deploy/example/storageclass-blobfuse.yaml
 kubectl apply -f deploy/example/storageclass-blob-nfs.yaml
-kubectl apply -f deploy/example/deployment.yaml
-kubectl apply -f deploy/example/statefulset.yaml
-kubectl apply -f deploy/example/statefulset-nonroot.yaml
-kubectl apply -f deploy/example/deployment-nfs.yaml
-kubectl apply -f deploy/example/statefulset-nfs.yaml
-kubectl apply -f deploy/example/statefulset-nonroot-nfs.yaml
 
-echo "sleep 90s ..."
-sleep 90
+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 \
+)
 
-kubectl get pods --field-selector status.phase=Running | grep deployment-blob
-kubectl get pods --field-selector status.phase=Running | grep statefulset-blob-0
-kubectl get pods --field-selector status.phase=Running | grep statefulset-blob-nonroot-0
-kubectl get pods --field-selector status.phase=Running | grep deployment-blob-nfs
-kubectl get pods --field-selector status.phase=Running | grep statefulset-blob-nfs-0
-kubectl get pods --field-selector status.phase=Running | grep statefulset-blob-nonroot-nfs-0
+for EXAMPLE in "${EXAMPLES[@]}"; do
+    rollout_and_wait $EXAMPLE
+done
 
 echo "deployment examples running completed."

test/external-e2e/run.sh

@@ -46,7 +46,7 @@ setup_e2e_binaries() {
 print_logs() {
     bash ./hack/verify-examples.sh
     echo "print out driver logs ..."
-    bash ./test/utils/blob_log.sh
+    bash ./test/utils/blob_log.sh $DRIVER
 }
 
 install_ginkgo

test/utils/blob_log.sh

@@ -18,6 +18,10 @@ set -e
 
 NS=kube-system
 CONTAINER=blob
+DRIVER=blob
+if [[ "$#" -gt 0 ]]; then
+    DRIVER=$1
+fi
 
 echo "print out all nodes status ..."
 kubectl get nodes -o wide
@@ -31,23 +35,23 @@ echo "print out all $NS namespace pods status ..."
 kubectl get pods -n${NS} -o wide
 echo "======================================================================================"
 
-echo "print out csi-blob-controller logs ..."
+echo "print out csi-$DRIVER-controller logs ..."
 echo "======================================================================================"
-LABEL='app=csi-blob-controller'
+LABEL="app=csi-$DRIVER-controller"
 kubectl get pods -n${NS} -l${LABEL} \
     | awk 'NR>1 {print $1}' \
     | xargs -I {} kubectl logs {} --prefix -c${CONTAINER} -n${NS}
 
-echo "print out csi-blob-node logs ..."
+echo "print out csi-$DRIVER-node logs ..."
 echo "======================================================================================"
-LABEL='app=csi-blob-node'
+LABEL="app=csi-$DRIVER-node"
 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-blob-controller -n kube-system | grep blob | awk '{print $4}'`
+ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
 curl http://$ip:29634/metrics