mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
e2e: run NFS-provisioner tests together with CephFS
NFS testing will automatically be enabled when CephFS is enabled. This makes sure the NFS tests run in the CI where there are different jobs for CephFS and RBD. With a dedicated testNFS variable, it is still possible to only run the NFS tests, when both CephFS and RBD are disabled. Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
parent
eb70fb9fd4
commit
9c91710d68
@ -77,4 +77,14 @@ func handleFlags() {
|
||||
framework.RegisterClusterFlags(flag.CommandLine)
|
||||
testing.Init()
|
||||
flag.Parse()
|
||||
|
||||
// testNFS will automatically be enabled when testCephFS is enabled,
|
||||
// this makes sure the NFS tests run in the CI where there are
|
||||
// different jobs for CephFS and RBD. With a dedicated testNFS
|
||||
// variable, it is still possible to only run the NFS tests, when both
|
||||
// CephFS and RBD are disabled.
|
||||
if testCephFS {
|
||||
testNFS = testCephFS
|
||||
deployNFS = deployCephFS
|
||||
}
|
||||
}
|
||||
|
@ -239,7 +239,7 @@ var _ = Describe("nfs", func() {
|
||||
var c clientset.Interface
|
||||
// deploy CephFS CSI
|
||||
BeforeEach(func() {
|
||||
if !testNFS || upgradeTesting {
|
||||
if !testNFS || upgradeTesting || helmTest {
|
||||
Skip("Skipping NFS E2E")
|
||||
}
|
||||
c = f.ClientSet
|
||||
|
Loading…
Reference in New Issue
Block a user