Merge pull request #3919 from jaidevmane/installVeleroFix

Fix -install-velero flag for e2e tests
vmware-tanzu · Jul 20, 2021 · 7052680 · 7052680
2 parents f8df9c0 + db375f3
commit 7052680
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/changelogs/unreleased/3919-jaidevmane b/changelogs/unreleased/3919-jaidevmane
@@ -0,0 +1 @@
+Fix -install-velero flag for e2e tests
diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -56,6 +56,7 @@ BSL_CONFIG ?=
 VSL_CONFIG ?=
 CLOUD_PROVIDER ?=
 OBJECT_STORE_PROVIDER ?=
+INSTALL_VELERO ?= true
 
 # Flags to create an additional BSL for multiple credentials tests
 ADDITIONAL_OBJECT_STORE_PROVIDER ?=
@@ -90,7 +91,8 @@ run: ginkgo
 		-additional-bsl-credentials-file=$(ADDITIONAL_CREDS_FILE) \
 		-additional-bsl-bucket=$(ADDITIONAL_BSL_BUCKET) \
 		-additional-bsl-prefix=$(ADDITIONAL_BSL_PREFIX) \
-		-additional-bsl-config=$(ADDITIONAL_BSL_CONFIG)
+		-additional-bsl-config=$(ADDITIONAL_BSL_CONFIG) \
+		-install-velero=$(INSTALL_VELERO)
 
 build: ginkgo
 	mkdir -p $(OUTPUT_DIR)

diff --git a/test/e2e/enable_api_group_versions_test.go b/test/e2e/enable_api_group_versions_test.go
@@ -84,8 +84,10 @@ var _ = Describe("[APIGroup] Velero tests with various CRD API group versions",
 		}
 		Expect(err).NotTo(HaveOccurred())
 
-		err = veleroUninstall(ctx, client.kubebuilder, installVelero, veleroNamespace)
-		Expect(err).NotTo(HaveOccurred())
+		if installVelero {
+			err = veleroUninstall(ctx, client.kubebuilder, installVelero, veleroNamespace)
+			Expect(err).NotTo(HaveOccurred())
+		}
 
 	})