From 2cb4b0515094ffa2606758b244f8253f41f50742 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sat, 16 Jan 2021 13:29:01 +0000 Subject: [PATCH 1/2] test: only run example verification on Linux cluster --- test/e2e/suite_test.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index 9931250acbf..689a0dd95c4 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -26,7 +26,6 @@ import ( "path/filepath" "strings" "testing" - "time" "github.com/kubernetes-csi/csi-driver-smb/pkg/smb" "github.com/kubernetes-csi/csi-driver-smb/test/utils/testutil" @@ -139,15 +138,15 @@ var _ = ginkgo.BeforeSuite(func() { var _ = ginkgo.AfterSuite(func() { if testutil.IsRunningInProw() { - createExampleDeployment := testCmd{ - command: "make", - args: []string{"create-example-deployment"}, - startLog: "create example deployments", - endLog: "example deployments created", + if !isWindowsCluster { + createExampleDeployment := testCmd{ + command: "make", + args: []string{"create-example-deployment"}, + startLog: "create example deployments", + endLog: "example deployments created", + } + execTestCmd([]testCmd{createExampleDeployment}) } - execTestCmd([]testCmd{createExampleDeployment}) - // sleep 120s waiting for deployment running complete - time.Sleep(120 * time.Second) smbLog := testCmd{ command: "bash", From 5f2ee0801f0e98a9f4779dd2128cc6621d3cf4c1 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 18 Jan 2021 07:22:25 +0000 Subject: [PATCH 2/2] test: refactor example verification test --- Makefile | 4 ---- test/e2e/suite_test.go | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1730a5f58ae..7b80b91ce25 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,3 @@ endif .PHONY: create-metrics-svc create-metrics-svc: kubectl create -f deploy/example/metrics/csi-smb-controller-svc.yaml - -.PHONY: create-example-deployment -create-example-deployment: - ./hack/verify-examples.sh diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index 689a0dd95c4..885d0f5a6a0 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -140,8 +140,8 @@ var _ = ginkgo.AfterSuite(func() { if testutil.IsRunningInProw() { if !isWindowsCluster { 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", }