mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-18 02:50:30 +00:00
e2e: remove 1.16 based test enablement in cephfs
Considering we are far out of these release and only care about kubernetes releases from v1.20, there is no need to have this version check in place for the tests. Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal
mergify[bot]
parent
7090a18141
commit
0c5be6d12d
199
e2e/cephfs.go
199
e2e/cephfs.go
@ -1010,108 +1010,105 @@ var _ = Describe("cephfs", func() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
By("create a PVC-PVC clone and bind it to an app", func() {
|
By("create a PVC-PVC clone and bind it to an app", func() {
|
||||||
// pvc clone is only supported from v1.16+
|
var wg sync.WaitGroup
|
||||||
if k8sVersionGreaterEquals(f.ClientSet, 1, 16) {
|
totalCount := 3
|
||||||
var wg sync.WaitGroup
|
wgErrs := make([]error, totalCount)
|
||||||
totalCount := 3
|
// totalSubvolumes represents the subvolumes in backend
|
||||||
wgErrs := make([]error, totalCount)
|
// always totalCount+parentPVC
|
||||||
// totalSubvolumes represents the subvolumes in backend
|
totalSubvolumes := totalCount + 1
|
||||||
// always totalCount+parentPVC
|
pvc, err := loadPVC(pvcPath)
|
||||||
totalSubvolumes := totalCount + 1
|
if err != nil {
|
||||||
pvc, err := loadPVC(pvcPath)
|
e2elog.Failf("failed to load PVC with error %v", err)
|
||||||
if err != nil {
|
|
||||||
e2elog.Failf("failed to load PVC with error %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
pvc.Namespace = f.UniqueName
|
|
||||||
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
|
|
||||||
if err != nil {
|
|
||||||
e2elog.Failf("failed to create PVC with error %v", err)
|
|
||||||
}
|
|
||||||
app, err := loadApp(appPath)
|
|
||||||
if err != nil {
|
|
||||||
e2elog.Failf("failed to load application with error %v", err)
|
|
||||||
}
|
|
||||||
app.Namespace = f.UniqueName
|
|
||||||
app.Spec.Volumes[0].PersistentVolumeClaim.ClaimName = pvc.Name
|
|
||||||
label := make(map[string]string)
|
|
||||||
label[appKey] = appLabel
|
|
||||||
app.Labels = label
|
|
||||||
opt := metav1.ListOptions{
|
|
||||||
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
|
|
||||||
}
|
|
||||||
wErr := writeDataInPod(app, &opt, f)
|
|
||||||
if wErr != nil {
|
|
||||||
e2elog.Failf("failed to write data from application %v", wErr)
|
|
||||||
}
|
|
||||||
|
|
||||||
pvcClone, err := loadPVC(pvcSmartClonePath)
|
|
||||||
if err != nil {
|
|
||||||
e2elog.Failf("failed to load PVC with error %v", err)
|
|
||||||
}
|
|
||||||
pvcClone.Spec.DataSource.Name = pvc.Name
|
|
||||||
pvcClone.Namespace = f.UniqueName
|
|
||||||
appClone, err := loadApp(appSmartClonePath)
|
|
||||||
if err != nil {
|
|
||||||
e2elog.Failf("failed to load application with error %v", err)
|
|
||||||
}
|
|
||||||
appClone.Namespace = f.UniqueName
|
|
||||||
wg.Add(totalCount)
|
|
||||||
// create clone and bind it to an app
|
|
||||||
for i := 0; i < totalCount; i++ {
|
|
||||||
go func(n int, p v1.PersistentVolumeClaim, a v1.Pod) {
|
|
||||||
name := fmt.Sprintf("%s%d", f.UniqueName, n)
|
|
||||||
wgErrs[n] = createPVCAndApp(name, f, &p, &a, deployTimeout)
|
|
||||||
wg.Done()
|
|
||||||
}(i, *pvcClone, *appClone)
|
|
||||||
}
|
|
||||||
wg.Wait()
|
|
||||||
|
|
||||||
failed := 0
|
|
||||||
for i, err := range wgErrs {
|
|
||||||
if err != nil {
|
|
||||||
// not using Failf() as it aborts the test and does not log other errors
|
|
||||||
e2elog.Logf("failed to create PVC or application (%s%d): %v", f.UniqueName, i, err)
|
|
||||||
failed++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if failed != 0 {
|
|
||||||
e2elog.Failf("deleting PVCs and apps failed, %d errors were logged", failed)
|
|
||||||
}
|
|
||||||
|
|
||||||
validateSubvolumeCount(f, totalSubvolumes, fileSystemName, subvolumegroup)
|
|
||||||
|
|
||||||
// delete parent pvc
|
|
||||||
err = deletePVCAndApp("", f, pvc, app)
|
|
||||||
if err != nil {
|
|
||||||
e2elog.Failf("failed to delete PVC or application with error %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
wg.Add(totalCount)
|
|
||||||
// delete clone and app
|
|
||||||
for i := 0; i < totalCount; i++ {
|
|
||||||
go func(n int, p v1.PersistentVolumeClaim, a v1.Pod) {
|
|
||||||
name := fmt.Sprintf("%s%d", f.UniqueName, n)
|
|
||||||
p.Spec.DataSource.Name = name
|
|
||||||
wgErrs[n] = deletePVCAndApp(name, f, &p, &a)
|
|
||||||
wg.Done()
|
|
||||||
}(i, *pvcClone, *appClone)
|
|
||||||
}
|
|
||||||
wg.Wait()
|
|
||||||
|
|
||||||
for i, err := range wgErrs {
|
|
||||||
if err != nil {
|
|
||||||
// not using Failf() as it aborts the test and does not log other errors
|
|
||||||
e2elog.Logf("failed to delete PVC or application (%s%d): %v", f.UniqueName, i, err)
|
|
||||||
failed++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if failed != 0 {
|
|
||||||
e2elog.Failf("deleting PVCs and apps failed, %d errors were logged", failed)
|
|
||||||
}
|
|
||||||
|
|
||||||
validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pvc.Namespace = f.UniqueName
|
||||||
|
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
|
||||||
|
if err != nil {
|
||||||
|
e2elog.Failf("failed to create PVC with error %v", err)
|
||||||
|
}
|
||||||
|
app, err := loadApp(appPath)
|
||||||
|
if err != nil {
|
||||||
|
e2elog.Failf("failed to load application with error %v", err)
|
||||||
|
}
|
||||||
|
app.Namespace = f.UniqueName
|
||||||
|
app.Spec.Volumes[0].PersistentVolumeClaim.ClaimName = pvc.Name
|
||||||
|
label := make(map[string]string)
|
||||||
|
label[appKey] = appLabel
|
||||||
|
app.Labels = label
|
||||||
|
opt := metav1.ListOptions{
|
||||||
|
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
|
||||||
|
}
|
||||||
|
wErr := writeDataInPod(app, &opt, f)
|
||||||
|
if wErr != nil {
|
||||||
|
e2elog.Failf("failed to write data from application %v", wErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
pvcClone, err := loadPVC(pvcSmartClonePath)
|
||||||
|
if err != nil {
|
||||||
|
e2elog.Failf("failed to load PVC with error %v", err)
|
||||||
|
}
|
||||||
|
pvcClone.Spec.DataSource.Name = pvc.Name
|
||||||
|
pvcClone.Namespace = f.UniqueName
|
||||||
|
appClone, err := loadApp(appSmartClonePath)
|
||||||
|
if err != nil {
|
||||||
|
e2elog.Failf("failed to load application with error %v", err)
|
||||||
|
}
|
||||||
|
appClone.Namespace = f.UniqueName
|
||||||
|
wg.Add(totalCount)
|
||||||
|
// create clone and bind it to an app
|
||||||
|
for i := 0; i < totalCount; i++ {
|
||||||
|
go func(n int, p v1.PersistentVolumeClaim, a v1.Pod) {
|
||||||
|
name := fmt.Sprintf("%s%d", f.UniqueName, n)
|
||||||
|
wgErrs[n] = createPVCAndApp(name, f, &p, &a, deployTimeout)
|
||||||
|
wg.Done()
|
||||||
|
}(i, *pvcClone, *appClone)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
failed := 0
|
||||||
|
for i, err := range wgErrs {
|
||||||
|
if err != nil {
|
||||||
|
// not using Failf() as it aborts the test and does not log other errors
|
||||||
|
e2elog.Logf("failed to create PVC or application (%s%d): %v", f.UniqueName, i, err)
|
||||||
|
failed++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if failed != 0 {
|
||||||
|
e2elog.Failf("deleting PVCs and apps failed, %d errors were logged", failed)
|
||||||
|
}
|
||||||
|
|
||||||
|
validateSubvolumeCount(f, totalSubvolumes, fileSystemName, subvolumegroup)
|
||||||
|
|
||||||
|
// delete parent pvc
|
||||||
|
err = deletePVCAndApp("", f, pvc, app)
|
||||||
|
if err != nil {
|
||||||
|
e2elog.Failf("failed to delete PVC or application with error %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Add(totalCount)
|
||||||
|
// delete clone and app
|
||||||
|
for i := 0; i < totalCount; i++ {
|
||||||
|
go func(n int, p v1.PersistentVolumeClaim, a v1.Pod) {
|
||||||
|
name := fmt.Sprintf("%s%d", f.UniqueName, n)
|
||||||
|
p.Spec.DataSource.Name = name
|
||||||
|
wgErrs[n] = deletePVCAndApp(name, f, &p, &a)
|
||||||
|
wg.Done()
|
||||||
|
}(i, *pvcClone, *appClone)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
for i, err := range wgErrs {
|
||||||
|
if err != nil {
|
||||||
|
// not using Failf() as it aborts the test and does not log other errors
|
||||||
|
e2elog.Logf("failed to delete PVC or application (%s%d): %v", f.UniqueName, i, err)
|
||||||
|
failed++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if failed != 0 {
|
||||||
|
e2elog.Failf("deleting PVCs and apps failed, %d errors were logged", failed)
|
||||||
|
}
|
||||||
|
|
||||||
|
validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup)
|
||||||
})
|
})
|
||||||
|
|
||||||
By("Create ROX PVC and bind it to an app", func() {
|
By("Create ROX PVC and bind it to an app", func() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user