Add E2E tests for rbd snapshot

.travis.yml

@@ -17,7 +17,7 @@ branches:
     - csi-v0.3
     - master
 
-go: 1.11.x
+go: 1.12.x
 
 env:
   global:

Gopkg.toml

@@ -15,7 +15,7 @@
   name = "google.golang.org/grpc"
   version = "1.10.0"
 
-[[constraint]]
+[[override]]
   version = "kubernetes-1.14.2"
   name = "k8s.io/apimachinery"
 
@@ -39,10 +39,14 @@
   name = "github.com/golang/protobuf"
   version = "1.1.0"
 
-[[constraint]]
+[[override]]
   name = "k8s.io/client-go"
   version = "kubernetes-1.14.2"
 
+[[override]]
+  name = "github.com/kubernetes-csi/external-snapshotter"
+  version = "v1.1.0"
+
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
   version = "kubernetes-1.14.2"
@@ -55,3 +59,8 @@
   go-tests = true
   non-go = true
   unused-packages = true
+
+# Prevent dep from pruning
+[[prune.project]]
+  name = "github.com/kubernetes-csi/external-snapshotter"
+  non-go = false

e2e/cephfs.go

@@ -1,6 +1,7 @@
 package e2e
 
 import (
+	"fmt"
 	"time"
 
 	. "github.com/onsi/ginkgo" // nolint
@@ -43,15 +44,19 @@ var _ = Describe("cephfs", func() {
 		cephfsFiles := getFilesinDirectory(cephfsDirPath)
 		for _, file := range cephfsFiles {
 			res, err := framework.RunKubectl("delete", "-f", cephfsDirPath+file.Name())
-			framework.Logf("failed to delete resource in %s with err %v", res, err)
+			if err != nil {
+				framework.Logf("failed to delete resource in %s with err %v", res, err)
+			}
 		}
-		deleteSecret(cephfsExamplePath + "secret.yaml")
-		deleteStorageClass(cephfsExamplePath + "storageclass.yaml")
+		deleteResource(cephfsExamplePath + "secret.yaml")
+		deleteResource(cephfsExamplePath + "storageclass.yaml")
 		deleteFileSystem()
 	})
 
 	Context("Test cephfs CSI", func() {
 		It("Test cephfs CSI", func() {
+			pvcPath := cephfsExamplePath + "pvc.yaml"
+			appPath := cephfsExamplePath + "pod.yaml"
 			By("checking provisioner statefulset is running")
 			timeout := time.Duration(deployTimeout) * time.Minute
 			err := framework.WaitForStatefulSetReplicasReady(cephfsDeploymentName, namespace, f.ClientSet, 1*time.Second, timeout)
@@ -67,17 +72,51 @@ var _ = Describe("cephfs", func() {
 
 			By("create and delete a PVC", func() {
 				By("create a PVC and Bind it to an app", func() {
-					pvcPath := cephfsExamplePath + "pvc.yaml"
-					appPath := cephfsExamplePath + "pod.yaml"
 					validatePVCAndAppBinding(pvcPath, appPath, f)
 
 				})
 
 				By("create a PVC and Bind it to an app with normal user", func() {
-					pvcPath := cephfsExamplePath + "pvc.yaml"
 					validateNormalUserPVCAccess(pvcPath, f)
 				})
+
+				By("create/delete multiple PVCs and Apps", func() {
+					totalCount := 2
+					pvc, err := loadPVC(pvcPath)
+					if err != nil {
+						Fail(err.Error())
+					}
+					pvc.Namespace = f.UniqueName
+
+					app, err := loadApp(appPath)
+					if err != nil {
+						Fail(err.Error())
+					}
+					app.Namespace = f.UniqueName
+					// create pvc and app
+					for i := 0; i < totalCount; i++ {
+						name := fmt.Sprintf("%s%d", f.UniqueName, i)
+						err := createPVCAndApp(name, f, pvc, app)
+						if err != nil {
+							Fail(err.Error())
+						}
+
+					}
+					// TODO add cephfs backend validation
+
+					// delete pvc and app
+					for i := 0; i < totalCount; i++ {
+						name := fmt.Sprintf("%s%d", f.UniqueName, i)
+						err := deletePVCAndApp(name, f, pvc, app)
+						if err != nil {
+							Fail(err.Error())
+						}
+
+					}
+				})
+
 			})
+
 		})
 	})