From 69b8feec125571a1449be632463872a0a0f1f9b9 Mon Sep 17 00:00:00 2001 From: Marcel Lauhoff Date: Fri, 14 Oct 2022 19:01:47 +0200 Subject: [PATCH] e2e: Feature flag RBD fscrypt tests (default disabled) Add test-rbd-fscrypt feature flag to e2e suite. Default disabled as the current CI system's kernel doesn't have the required features enabled. Signed-off-by: Marcel Lauhoff --- e2e/e2e_test.go | 1 + e2e/rbd.go | 5 +++++ e2e/utils.go | 1 + 3 files changed, 7 insertions(+) diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 338a776b6..40745d8b5 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -39,6 +39,7 @@ func init() { flag.BoolVar(&deployNFS, "deploy-nfs", false, "deploy nfs csi driver") flag.BoolVar(&testCephFS, "test-cephfs", true, "test cephFS csi driver") 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") flag.BoolVar(&testNFS, "test-nfs", false, "test nfs csi driver") flag.BoolVar(&helmTest, "helm-test", false, "tests running on deployment via helm") diff --git a/e2e/rbd.go b/e2e/rbd.go index fc2feabdb..649fd5d93 100644 --- a/e2e/rbd.go +++ b/e2e/rbd.go @@ -241,6 +241,11 @@ func ByFileAndBlockEncryption( callback(validateEncryptedPVCAndAppBinding, isBlockEncryptedPVC, util.EncryptionTypeBlock) }) By(text+" (file)", func() { + if !testRBDFSCrypt { + e2elog.Logf("skipping RBD fscrypt file encryption test") + + return + } callback(validateEncryptedFilesystemAndAppBinding, isFileEncryptedPVC, util.EncryptionTypeFile) }) } diff --git a/e2e/utils.go b/e2e/utils.go index f844bfae6..4e259805f 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -85,6 +85,7 @@ var ( deployNFS bool testCephFS bool testRBD bool + testRBDFSCrypt bool testNBD bool testNFS bool helmTest bool