From 42744213f6848a429b3d3ba48416353e87b5cc9c Mon Sep 17 00:00:00 2001 From: Marcel Lauhoff Date: Thu, 8 Sep 2022 16:12:56 +0200 Subject: [PATCH] e2e: Add test-cephfs-fscrypt flag Add flag to default disable Ceph FS fscrypt tests, as they require a custom minikube ISO Signed-off-by: Marcel Lauhoff --- e2e/e2e_test.go | 1 + e2e/utils.go | 39 ++++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 40745d8b5..e4538788a 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -38,6 +38,7 @@ func init() { flag.BoolVar(&deployRBD, "deploy-rbd", true, "deploy rbd csi driver") flag.BoolVar(&deployNFS, "deploy-nfs", false, "deploy nfs csi driver") flag.BoolVar(&testCephFS, "test-cephfs", true, "test cephFS csi driver") + flag.BoolVar(&testCephFSFscrypt, "test-cephfs-fscrypt", false, "test CephFS csi driver fscrypt support") flag.BoolVar(&testRBD, "test-rbd", true, "test rbd csi driver") flag.BoolVar(&testRBDFSCrypt, "test-rbd-fscrypt", false, "test rbd csi driver fscrypt support") flag.BoolVar(&testNBD, "test-nbd", false, "test rbd csi driver with rbd-nbd mounter") diff --git a/e2e/utils.go b/e2e/utils.go index d1ad533dc..e2ef7950e 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -79,25 +79,26 @@ const ( var ( // cli flags. - deployTimeout int - deployCephFS bool - deployRBD bool - deployNFS bool - testCephFS bool - testRBD bool - testRBDFSCrypt bool - testNBD bool - testNFS bool - helmTest bool - upgradeTesting bool - upgradeVersion string - cephCSINamespace string - rookNamespace string - radosNamespace string - poll = 2 * time.Second - isOpenShift bool - clusterID string - nfsDriverName string + deployTimeout int + deployCephFS bool + deployRBD bool + deployNFS bool + testCephFS bool + testCephFSFscrypt bool + testRBD bool + testRBDFSCrypt bool + testNBD bool + testNFS bool + helmTest bool + upgradeTesting bool + upgradeVersion string + cephCSINamespace string + rookNamespace string + radosNamespace string + poll = 2 * time.Second + isOpenShift bool + clusterID string + nfsDriverName string ) type cephfsFilesystem struct {