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 <marcel.lauhoff@suse.com>
This commit is contained in:
Marcel Lauhoff 2022-09-08 16:12:56 +02:00 committed by mergify[bot]
parent 2ade867211
commit 42744213f6
2 changed files with 21 additions and 19 deletions

View File

@ -38,6 +38,7 @@ func init() {
flag.BoolVar(&deployRBD, "deploy-rbd", true, "deploy rbd csi driver") flag.BoolVar(&deployRBD, "deploy-rbd", true, "deploy rbd csi driver")
flag.BoolVar(&deployNFS, "deploy-nfs", false, "deploy nfs csi driver") flag.BoolVar(&deployNFS, "deploy-nfs", false, "deploy nfs csi driver")
flag.BoolVar(&testCephFS, "test-cephfs", true, "test cephFS 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(&testRBD, "test-rbd", true, "test rbd csi driver")
flag.BoolVar(&testRBDFSCrypt, "test-rbd-fscrypt", false, "test rbd csi driver fscrypt support") 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(&testNBD, "test-nbd", false, "test rbd csi driver with rbd-nbd mounter")

View File

@ -79,25 +79,26 @@ const (
var ( var (
// cli flags. // cli flags.
deployTimeout int deployTimeout int
deployCephFS bool deployCephFS bool
deployRBD bool deployRBD bool
deployNFS bool deployNFS bool
testCephFS bool testCephFS bool
testRBD bool testCephFSFscrypt bool
testRBDFSCrypt bool testRBD bool
testNBD bool testRBDFSCrypt bool
testNFS bool testNBD bool
helmTest bool testNFS bool
upgradeTesting bool helmTest bool
upgradeVersion string upgradeTesting bool
cephCSINamespace string upgradeVersion string
rookNamespace string cephCSINamespace string
radosNamespace string rookNamespace string
poll = 2 * time.Second radosNamespace string
isOpenShift bool poll = 2 * time.Second
clusterID string isOpenShift bool
nfsDriverName string clusterID string
nfsDriverName string
) )
type cephfsFilesystem struct { type cephfsFilesystem struct {