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

e2e: remove the release check in clone test validation

Browse Source 
we no longer require the kubernetes validation for clone tests in
the e2e tests. This commit remove it for RBD.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2022-04-11 16:51:24 +05:30 committed by mergify[bot]
parent 5bc8584b02
commit 5e23010e2b
1 changed files with 115 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e2e/upgrade-rbd.go
View File

@ -250,8 +250,6 @@ var _ = Describe("RBD Upgrade Testing", func() {
e2elog.Failf("failed to calculate checksum: %v", err) e2elog.Failf("failed to calculate checksum: %v", err)
} }
// pvc clone is only supported from v1.16+
if k8sVersionGreaterEquals(f.ClientSet, 1, 16) {
// Create snapshot of the pvc // Create snapshot of the pvc
snapshotPath := rbdExamplePath + "snapshot.yaml" snapshotPath := rbdExamplePath + "snapshot.yaml"
snap := getSnapshot(snapshotPath) snap := getSnapshot(snapshotPath)
@ -262,7 +260,7 @@ var _ = Describe("RBD Upgrade Testing", func() {
if err != nil { if err != nil {
e2elog.Failf("failed to create snapshot %v", err) e2elog.Failf("failed to create snapshot %v", err)
} }
}
err = deletePod(app.Name, app.Namespace, f.ClientSet, deployTimeout) err = deletePod(app.Name, app.Namespace, f.ClientSet, deployTimeout)
if err != nil { if err != nil {
e2elog.Failf("failed to delete application: %v", err) e2elog.Failf("failed to delete application: %v", err)
@ -299,9 +297,6 @@ var _ = Describe("RBD Upgrade Testing", func() {
pvcClonePath := rbdExamplePath + "pvc-restore.yaml" pvcClonePath := rbdExamplePath + "pvc-restore.yaml"
appClonePath := rbdExamplePath + "pod-restore.yaml" appClonePath := rbdExamplePath + "pod-restore.yaml"
label := make(map[string]string) label := make(map[string]string)
// pvc clone is only supported from v1.16+
if k8sVersionGreaterEquals(f.ClientSet, 1, 16) {
pvcClone, err := loadPVC(pvcClonePath) pvcClone, err := loadPVC(pvcClonePath)
if err != nil { if err != nil {
e2elog.Failf("failed to load pvc: %v", err) e2elog.Failf("failed to load pvc: %v", err)
@ -344,7 +339,6 @@ var _ = Describe("RBD Upgrade Testing", func() {
e2elog.Failf("failed to delete pvc and application: %v", err) e2elog.Failf("failed to delete pvc and application: %v", err)
} }
}
}) })
By("Create clone from existing PVC", func() { By("Create clone from existing PVC", func() {
@ -352,8 +346,6 @@ var _ = Describe("RBD Upgrade Testing", func() {
appSmartClonePath := rbdExamplePath + "pod-clone.yaml" appSmartClonePath := rbdExamplePath + "pod-clone.yaml"
label := make(map[string]string) label := make(map[string]string)
// pvc clone is only supported from v1.16+
if k8sVersionGreaterEquals(f.ClientSet, 1, 16) {
pvcClone, err := loadPVC(pvcSmartClonePath) pvcClone, err := loadPVC(pvcSmartClonePath)
if err != nil { if err != nil {
e2elog.Failf("failed to load pvc: %v", err) e2elog.Failf("failed to load pvc: %v", err)
@ -395,16 +387,12 @@ var _ = Describe("RBD Upgrade Testing", func() {
if err != nil { if err != nil {
e2elog.Failf("failed to delete pvc and application: %v", err) e2elog.Failf("failed to delete pvc and application: %v", err)
} }
}
}) })
By("Resize pvc and verify expansion", func() { By("Resize pvc and verify expansion", func() {
pvcExpandSize := "5Gi" pvcExpandSize := "5Gi"
label := make(map[string]string) label := make(map[string]string)
// Resize 0.3.0 is only supported from v1.15+
if k8sVersionGreaterEquals(f.ClientSet, 1, 15) {
label[appKey] = appLabel label[appKey] = appLabel
opt := metav1.ListOptions{ opt := metav1.ListOptions{
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]), LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
@ -432,7 +420,6 @@ var _ = Describe("RBD Upgrade Testing", func() {
if err != nil { if err != nil {
e2elog.Failf("failed to check directory size: %v", err) e2elog.Failf("failed to check directory size: %v", err)
} }
}
}) })
By("delete pvc and app", func() { By("delete pvc and app", func() {