Set up CI for e2e test

Author: chewong

Gopkg.lock

@@ -12,15 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PKG=sigs.k8s.io/blobfuse-csi-driver
-REGISTRY_NAME?=andyzhangx
-IMAGE_NAME=blobfuse-csi
-IMAGE_VERSION=v0.4.0
-IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
-IMAGE_TAG_LATEST=$(REGISTRY_NAME)/$(IMAGE_NAME):latest
-GIT_COMMIT?=$(shell git rev-parse HEAD)
-BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
-LDFLAGS?="-X ${PKG}/pkg/blobfuse.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blobfuse.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blobfuse.buildDate=${BUILD_DATE} -s -w -extldflags '-static'"
+PKG = sigs.k8s.io/blobfuse-csi-driver
+REGISTRY ?= andyzhangx
+IMAGE_NAME = blobfuse-csi
+IMAGE_VERSION ?= v0.4.0
+# Use a custom version for E2E tests if we are in Prow
+ifdef AZURE_CREDENTIALS
+override IMAGE_VERSION := e2e-$(GIT_COMMIT)
+endif
+IMAGE_TAG = $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
+IMAGE_TAG_LATEST = $(REGISTRY_NAME)/$(IMAGE_NAME):latest
+GIT_COMMIT ?= $(shell git rev-parse HEAD)
+BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
+LDFLAGS ?= "-X ${PKG}/pkg/blobfuse.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blobfuse.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blobfuse.buildDate=${BUILD_DATE} -s -w -extldflags '-static'"
+GINKGO_FLAGS = -ginkgo.noColor -ginkgo.v
 GO111MODULE = off
 export GO111MODULE
 
@@ -44,7 +49,28 @@ integration-test: blobfuse
 
 .PHONY: e2e-test
 e2e-test:
-	test/e2e/run-test.sh
+	go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS}
+
+.PHONY: e2e-bootstrap
+e2e-bootstrap: install-helm
+	# Only build and push the image if it does not exist in the registry
+	docker pull $(IMAGE_TAG) || make blobfuse-container push
+	helm install charts/latest/blobfuse-csi-driver -n blobfuse-csi-driver --namespace kube-system --wait \
+		--set image.blobfuse.pullPolicy=IfNotPresent \
+		--set image.blobfuse.repository=$(REGISTRY)/$(IMAGE_NAME) \
+		--set image.blobfuse.tag=$(IMAGE_VERSION)
+
+.PHONY: install-helm
+install-helm:
+	# Use v2.11.0 helm to match tiller's version in clusters made by aks-engine
+	curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | DESIRED_VERSION=v2.11.0 bash
+	# Make sure tiller is ready
+	kubectl wait pod -l name=tiller --namespace kube-system --for condition=ready --timeout 5m
+	helm version
+
+.PHONY: e2e-teardown
+e2e-teardown:
+	helm delete --purge blobfuse-csi-driver
 
 .PHONY: blobfuse
 blobfuse:

Makefile

@@ -18,20 +18,17 @@ package e2e
 
 import (
 	"fmt"
-	"os"
 
-	"sigs.k8s.io/blobfuse-csi-driver/pkg/blobfuse"
 	"sigs.k8s.io/blobfuse-csi-driver/test/e2e/driver"
 	"sigs.k8s.io/blobfuse-csi-driver/test/e2e/testsuites"
 
-	. "github.com/onsi/ginkgo"
-	"github.com/pborman/uuid"
+	"github.com/onsi/ginkgo"
 	v1 "k8s.io/api/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
 )
 
-var _ = Describe("Dynamic Provisioning", func() {
+var _ = ginkgo.Describe("[blobfuse-csi-e2e] Dynamic Provisioning", func() {
 	f := framework.NewDefaultFramework("blobfuse")
 
 	var (
@@ -40,21 +37,13 @@ var _ = Describe("Dynamic Provisioning", func() {
 		testDriver driver.PVTestDriver
 	)
 
-	nodeid := os.Getenv("nodeid")
-	blobfuseDriver := blobfuse.NewDriver(nodeid)
-	endpoint := fmt.Sprintf("unix:///tmp/csi-%s.sock", uuid.NewUUID().String())
-
-	go func() {
-		blobfuseDriver.Run(endpoint)
-	}()
-
-	BeforeEach(func() {
+	ginkgo.BeforeEach(func() {
 		cs = f.ClientSet
 		ns = f.Namespace
 	})
 
 	testDriver = driver.InitBlobFuseCSIDriver()
-	It(fmt.Sprintf("should create a volume on demand"), func() {
+	ginkgo.It(fmt.Sprintf("should create a volume on demand"), func() {
 		pods := []testsuites.PodDetails{
 			{
 				Cmd: "echo 'hello world' > /mnt/test-1/data && grep 'hello world' /mnt/test-1/data",
@@ -76,7 +65,7 @@ var _ = Describe("Dynamic Provisioning", func() {
 		test.Run(cs, ns)
 	})
 
-	It("should create a deployment object, write and read to it, delete the pod and write and read to it again", func() {
+	ginkgo.It("should create a deployment object, write and read to it, delete the pod and write and read to it again", func() {
 		pod := testsuites.PodDetails{
 			Cmd: "echo 'hello world' >> /mnt/test-1/data && while true; do sleep 1; done",
 			Volumes: []testsuites.VolumeDetails{
@@ -102,7 +91,7 @@ var _ = Describe("Dynamic Provisioning", func() {
 	})
 
 	// Track issue https://github.com/kubernetes/kubernetes/issues/70505
-	It("should create a volume on demand and mount it as readOnly in a pod", func() {
+	ginkgo.It("should create a volume on demand and mount it as readOnly in a pod", func() {
 		pods := []testsuites.PodDetails{
 			{
 				Cmd: "touch /mnt/test-1/data",
@@ -126,7 +115,7 @@ var _ = Describe("Dynamic Provisioning", func() {
 		test.Run(cs, ns)
 	})
 
-	It("should create multiple PV objects, bind to PVCs and attach all to different pods on the same node", func() {
+	ginkgo.It("should create multiple PV objects, bind to PVCs and attach all to different pods on the same node", func() {
 		pods := []testsuites.PodDetails{
 			{
 				Cmd: "while true; do echo $(date -u) >> /mnt/test-1/data; sleep 1; done",
@@ -163,7 +152,7 @@ var _ = Describe("Dynamic Provisioning", func() {
 		test.Run(cs, ns)
 	})
 
-	It(fmt.Sprintf("should delete PV with reclaimPolicy %q", v1.PersistentVolumeReclaimDelete), func() {
+	ginkgo.It(fmt.Sprintf("should delete PV with reclaimPolicy %q", v1.PersistentVolumeReclaimDelete), func() {
 		reclaimPolicy := v1.PersistentVolumeReclaimDelete
 		volumes := []testsuites.VolumeDetails{
 			{
@@ -179,7 +168,7 @@ var _ = Describe("Dynamic Provisioning", func() {
 		test.Run(cs, ns)
 	})
 
-	It(fmt.Sprintf("[env] should retain PV with reclaimPolicy %q", v1.PersistentVolumeReclaimRetain), func() {
+	ginkgo.It(fmt.Sprintf("[env] should retain PV with reclaimPolicy %q", v1.PersistentVolumeReclaimRetain), func() {
 		reclaimPolicy := v1.PersistentVolumeReclaimRetain
 		volumes := []testsuites.VolumeDetails{
 			{

test/e2e/dynamic_provisioning.go renamed to test/e2e/dynamic_provisioning_test.go

@@ -19,15 +19,12 @@ package e2e
 import (
 	"context"
 	"fmt"
-	"os"
 
-	"sigs.k8s.io/blobfuse-csi-driver/pkg/blobfuse"
 	"sigs.k8s.io/blobfuse-csi-driver/test/e2e/driver"
 	"sigs.k8s.io/blobfuse-csi-driver/test/e2e/testsuites"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	. "github.com/onsi/ginkgo"
-	"github.com/pborman/uuid"
+	"github.com/onsi/ginkgo"
 	v1 "k8s.io/api/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -41,7 +38,7 @@ var (
 	defaultVolumeSizeBytes int64 = defaultVolumeSize * 1024 * 1024 * 1024
 )
 
-var _ = Describe("[blobfuse-csi-e2e] [single-az] Pre-Provisioned", func() {
+var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
 	f := framework.NewDefaultFramework("blobfuse")
 
 	var (
@@ -52,40 +49,33 @@ var _ = Describe("[blobfuse-csi-e2e] [single-az] Pre-Provisioned", func() {
 		// Set to true if the volume should be deleted automatically after test
 		skipManuallyDeletingVolume bool
 	)
-	nodeid := os.Getenv("nodeid")
-	blobfuseDriver := blobfuse.NewDriver(nodeid)
-	endpoint := fmt.Sprintf("unix:///tmp/csi-%s.sock", uuid.NewUUID().String())
 
-	go func() {
-		blobfuseDriver.Run(endpoint)
-	}()
-
-	BeforeEach(func() {
+	ginkgo.BeforeEach(func() {
 		cs = f.ClientSet
 		ns = f.Namespace
 		testDriver = driver.InitBlobFuseCSIDriver()
 	})
 
-	AfterEach(func() {
+	ginkgo.AfterEach(func() {
 		if !skipManuallyDeletingVolume {
 			req := &csi.DeleteVolumeRequest{
 				VolumeId: volumeID,
 			}
 			_, err := blobfuseDriver.DeleteVolume(context.Background(), req)
 			if err != nil {
-				Fail(fmt.Sprintf("create volume %q error: %v", volumeID, err))
+				ginkgo.Fail(fmt.Sprintf("create volume %q error: %v", volumeID, err))
 			}
 		}
 	})
 
-	It("[env] should use a pre-provisioned volume and mount it as readOnly in a pod", func() {
+	ginkgo.It("[env] should use a pre-provisioned volume and mount it as readOnly in a pod", func() {
 		req := makeCreateVolumeReq("pre-provisioned-readOnly")
 		resp, err := blobfuseDriver.CreateVolume(context.Background(), req)
 		if err != nil {
-			Fail(fmt.Sprintf("create volume error: %v", err))
+			ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
 		}
 		volumeID = resp.Volume.VolumeId
-		By(fmt.Sprintf("Successfully provisioned BloBFuse volume: %q\n", volumeID))
+		ginkgo.By(fmt.Sprintf("Successfully provisioned BloBFuse volume: %q\n", volumeID))
 
 		volumeSize := fmt.Sprintf("%dGi", defaultVolumeSize)
 		pods := []testsuites.PodDetails{
@@ -112,14 +102,14 @@ var _ = Describe("[blobfuse-csi-e2e] [single-az] Pre-Provisioned", func() {
 		test.Run(cs, ns)
 	})
 
-	It(fmt.Sprintf("[env] should use a pre-provisioned volume and retain PV with reclaimPolicy %q", v1.PersistentVolumeReclaimRetain), func() {
+	ginkgo.It(fmt.Sprintf("[env] should use a pre-provisioned volume and retain PV with reclaimPolicy %q", v1.PersistentVolumeReclaimRetain), func() {
 		req := makeCreateVolumeReq("pre-provisioned-retain-reclaimPolicy")
 		resp, err := blobfuseDriver.CreateVolume(context.Background(), req)
 		if err != nil {
-			Fail(fmt.Sprintf("create volume error: %v", err))
+			ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
 		}
 		volumeID = resp.Volume.VolumeId
-		By(fmt.Sprintf("Successfully provisioned BlobFuse volume: %q\n", volumeID))
+		ginkgo.By(fmt.Sprintf("Successfully provisioned BlobFuse volume: %q\n", volumeID))
 
 		volumeSize := fmt.Sprintf("%dGi", defaultVolumeSize)
 		reclaimPolicy := v1.PersistentVolumeReclaimRetain