mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 22:30:23 +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 CephFS.

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

17
e2e/upgrade-cephfs.go
View File

@ -230,9 +230,6 @@ var _ = Describe("CephFS Upgrade Testing", func() {
if err != nil { if err != nil {
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, 17) {
// Create snapshot of the pvc // Create snapshot of the pvc
snapshotPath := cephFSExamplePath + "snapshot.yaml" snapshotPath := cephFSExamplePath + "snapshot.yaml"
snap := getSnapshot(snapshotPath) snap := getSnapshot(snapshotPath)
@ -243,7 +240,6 @@ var _ = Describe("CephFS 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)
@ -280,9 +276,6 @@ var _ = Describe("CephFS Upgrade Testing", func() {
pvcClonePath := cephFSExamplePath + "pvc-restore.yaml" pvcClonePath := cephFSExamplePath + "pvc-restore.yaml"
appClonePath := cephFSExamplePath + "pod-restore.yaml" appClonePath := cephFSExamplePath + "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, 17) {
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)
@ -310,7 +303,6 @@ var _ = Describe("CephFS Upgrade Testing", func() {
if err != nil { if err != nil {
e2elog.Failf("failed to calculate checksum: %v", err) e2elog.Failf("failed to calculate checksum: %v", err)
} }
if strings.Compare(newCheckSum, checkSum) != 0 { if strings.Compare(newCheckSum, checkSum) != 0 {
e2elog.Failf( e2elog.Failf(
"The checksum of files did not match, expected %s received %s ", "The checksum of files did not match, expected %s received %s ",
@ -335,8 +327,6 @@ var _ = Describe("CephFS Upgrade Testing", func() {
if err != nil { if err != nil {
e2elog.Failf("failed to delete snapshot %v", err) e2elog.Failf("failed to delete snapshot %v", err)
} }
}
}) })
By("Create clone from existing PVC", func() { By("Create clone from existing PVC", func() {
@ -344,8 +334,6 @@ var _ = Describe("CephFS Upgrade Testing", func() {
appSmartClonePath := cephFSExamplePath + "pod-clone.yaml" appSmartClonePath := cephFSExamplePath + "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)
@ -388,16 +376,12 @@ var _ = Describe("CephFS 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]),
@ -424,7 +408,6 @@ var _ = Describe("CephFS 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") By("delete pvc and app")

1
e2e/upgrade-rbd.go
View File

@ -338,7 +338,6 @@ 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("Create clone from existing PVC", func() { By("Create clone from existing PVC", func() {