mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: run NFS-provisioner tests together with CephFS

Browse Source 
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:
Niels de Vos 2022-04-11 17:00:25 +02:00 committed by mergify[bot]
parent eb70fb9fd4
commit 9c91710d68
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/e2e_test.go
View File

@ -77,4 +77,14 @@ func handleFlags() {
framework.RegisterClusterFlags(flag.CommandLine) framework.RegisterClusterFlags(flag.CommandLine)
testing.Init() testing.Init()
flag.Parse() 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
}
} }

2
e2e/nfs.go
View File

@ -239,7 +239,7 @@ var _ = Describe("nfs", func() {
var c clientset.Interface var c clientset.Interface
// deploy CephFS CSI // deploy CephFS CSI
BeforeEach(func() { BeforeEach(func() {
if !testNFS || upgradeTesting { if !testNFS || upgradeTesting || helmTest {
Skip("Skipping NFS E2E") Skip("Skipping NFS E2E")
} }
c = f.ClientSet c = f.ClientSet