Merge pull request #322 from andyzhangx/refactor-verify-examples-test

test: refactor example verification test

Author: andyzhangx

Makefile

@@ -141,10 +141,6 @@ clean:
 create-metrics-svc:
 	kubectl create -f deploy/example/metrics/csi-blob-controller-svc.yaml
 
-.PHONY: create-example-deployment
-create-example-deployment:
-	./hack/verify-examples.sh
-
 .PHONY: delete-metrics-svc
 delete-metrics-svc:
 	kubectl delete -f deploy/example/metrics/csi-blob-controller-svc.yaml --ignore-not-found

hack/verify-examples.sh

@@ -21,8 +21,8 @@ kubectl apply -f deploy/example/deployment.yaml
 kubectl apply -f deploy/example/statefulset.yaml
 kubectl apply -f deploy/example/statefulset-nonroot.yaml
 
-echo "sleep 90s ..."
-sleep 90
+echo "sleep 60s ..."
+sleep 60
 
 kubectl get pods --field-selector status.phase=Running | grep deployment-blob
 kubectl get pods --field-selector status.phase=Running | grep statefulset-blob-0

test/e2e/suite_test.go

@@ -27,7 +27,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/reporters"
@@ -118,14 +117,12 @@ var _ = ginkgo.BeforeSuite(func() {
 
 var _ = ginkgo.AfterSuite(func() {
 	createExampleDeployment := testCmd{
-		command:  "make",
-		args:     []string{"create-example-deployment"},
+		command:  "bash",
+		args:     []string{"hack/verify-examples.sh"},
 		startLog: "create example deployments",
 		endLog:   "example deployments created",
 	}
 	execTestCmd([]testCmd{createExampleDeployment})
-	// sleep 120s waiting for deployment running complete
-	time.Sleep(120 * time.Second)
 
 	blobLog := testCmd{
 		command:  "bash",