Skip to content

Commit

Permalink
e2e: Feature flag RBD fscrypt tests (default disabled)
Browse files Browse the repository at this point in the history
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 <marcel.lauhoff@suse.com>
  • Loading branch information
Marcel Lauhoff authored and mergify[bot] committed Oct 17, 2022
1 parent 5a55419 commit 69b8fee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 5 additions & 0 deletions e2e/rbd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
}
Expand Down
1 change: 1 addition & 0 deletions e2e/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ var (
deployNFS bool
testCephFS bool
testRBD bool
testRBDFSCrypt bool
testNBD bool
testNFS bool
helmTest bool
Expand Down

0 comments on commit 69b8fee

Please sign in to comment.