Fix -install-velero flag for e2e tests

Signed-off-by: Jai Subash Devmane <jdevmane@redhat.com>
This commit is contained in:
Jai Subash Devmane
2021-07-02 17:21:36 -04:00
parent f28a41dcde
commit db375f34c1
3 changed files with 8 additions and 3 deletions
+1
View File
@@ -0,0 +1 @@
Fix -install-velero flag for e2e tests
+3 -1
View File
@@ -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)
+4 -2
View File
@@ -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())
}
})