mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: run generic ephemeral for kubernetes 1.21+

Browse Source 
Currently, we are skipping the generic ephemeral
testing if the kubernetes version is less than
1.21 because of this one the who test suite is
getting skipped and e2e is marked as success
in 2 minutes. This commit runs the ephemeral
tests if the kube=>1.21+. If we do this, for
the lower version we can run other tests.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2021-12-01 13:06:53 +05:30 committed by mergify[bot]
parent 73ecf06f97
commit d943fbd265
2 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
e2e/cephfs.go
View File

@ -315,33 +315,32 @@ var _ = Describe("cephfs", func() {
} }
By("verify generic ephemeral volume support", func() { By("verify generic ephemeral volume support", func() {
// generic ephemeral volume support is beta since v1.21. // generic ephemeral volume support is beta since v1.21.
if !k8sVersionGreaterEquals(f.ClientSet, 1, 21) { if k8sVersionGreaterEquals(f.ClientSet, 1, 21) {
Skip("generic ephemeral volume only supported from v1.21+") err := createCephfsStorageClass(f.ClientSet, f, true, nil)
} if err != nil {
err := createCephfsStorageClass(f.ClientSet, f, true, nil) e2elog.Failf("failed to create CephFS storageclass: %v", err)
if err != nil { }
e2elog.Failf("failed to create CephFS storageclass: %v", err) // create application
} app, err := loadApp(appEphemeralPath)
// create application if err != nil {
app, err := loadApp(appEphemeralPath) e2elog.Failf("failed to load application: %v", err)
if err != nil { }
e2elog.Failf("failed to load application: %v", err) app.Namespace = f.UniqueName
} err = createApp(f.ClientSet, app, deployTimeout)
app.Namespace = f.UniqueName if err != nil {
err = createApp(f.ClientSet, app, deployTimeout) e2elog.Failf("failed to create application: %v", err)
if err != nil { }
e2elog.Failf("failed to create application: %v", err) validateSubvolumeCount(f, 1, fileSystemName, subvolumegroup)
} // delete pod
validateSubvolumeCount(f, 1, fileSystemName, subvolumegroup) err = deletePod(app.Name, app.Namespace, f.ClientSet, deployTimeout)
// delete pod if err != nil {
err = deletePod(app.Name, app.Namespace, f.ClientSet, deployTimeout) e2elog.Failf("failed to delete application: %v", err)
if err != nil { }
e2elog.Failf("failed to delete application: %v", err) validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup)
} err = deleteResource(cephFSExamplePath + "storageclass.yaml")
validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup) if err != nil {
err = deleteResource(cephFSExamplePath + "storageclass.yaml") e2elog.Failf("failed to delete CephFS storageclass: %v", err)
if err != nil { }
e2elog.Failf("failed to delete CephFS storageclass: %v", err)
} }
}) })

49
e2e/rbd.go
View File

@ -373,31 +373,30 @@ var _ = Describe("RBD", func() {
} }
By("verify generic ephemeral volume support", func() { By("verify generic ephemeral volume support", func() {
// generic ephemeral volume support is supported from 1.21 // generic ephemeral volume support is supported from 1.21
if !k8sVersionGreaterEquals(f.ClientSet, 1, 21) { if k8sVersionGreaterEquals(f.ClientSet, 1, 21) {
Skip("generic ephemeral volume only supported from v1.21+") // create application
} app, err := loadApp(appEphemeralPath)
// create application if err != nil {
app, err := loadApp(appEphemeralPath) e2elog.Failf("failed to load application: %v", err)
if err != nil { }
e2elog.Failf("failed to load application: %v", err) app.Namespace = f.UniqueName
} err = createApp(f.ClientSet, app, deployTimeout)
app.Namespace = f.UniqueName if err != nil {
err = createApp(f.ClientSet, app, deployTimeout) e2elog.Failf("failed to create application: %v", err)
if err != nil { }
e2elog.Failf("failed to create application: %v", err) // validate created backend rbd images
} validateRBDImageCount(f, 1, defaultRBDPool)
// validate created backend rbd images err = deletePod(app.Name, app.Namespace, f.ClientSet, deployTimeout)
validateRBDImageCount(f, 1, defaultRBDPool) if err != nil {
err = deletePod(app.Name, app.Namespace, f.ClientSet, deployTimeout) e2elog.Failf("failed to delete application: %v", err)
if err != nil { }
e2elog.Failf("failed to delete application: %v", err) // validate created backend rbd images
} validateRBDImageCount(f, 0, defaultRBDPool)
// validate created backend rbd images // validate images in trash
validateRBDImageCount(f, 0, defaultRBDPool) err = waitToRemoveImagesFromTrash(f, defaultRBDPool, deployTimeout)
// validate images in trash if err != nil {
err = waitToRemoveImagesFromTrash(f, defaultRBDPool, deployTimeout) e2elog.Failf("failed to validate rbd images in pool %s trash: %v", defaultRBDPool, err)
if err != nil { }
e2elog.Failf("failed to validate rbd images in pool %s trash: %v", defaultRBDPool, err)
} }
}) })