From 8dc84eda9df2a82c3621df4c80cb37930ee9b526 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 28 Aug 2024 16:18:43 -0400 Subject: [PATCH] Fix for GenericPersistentVolume/Disruptive test failures Signed-off-by: Davanum Srinivas --- test/e2e/storage/generic_persistent_volume-disruptive.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/e2e/storage/generic_persistent_volume-disruptive.go b/test/e2e/storage/generic_persistent_volume-disruptive.go index 8ac6e1648a2..d73c3e3b3fb 100644 --- a/test/e2e/storage/generic_persistent_volume-disruptive.go +++ b/test/e2e/storage/generic_persistent_volume-disruptive.go @@ -109,9 +109,6 @@ func createPodPVCFromSC(ctx context.Context, f *framework.Framework, c clientset pvc, err = c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Create(ctx, pvc, metav1.CreateOptions{}) framework.ExpectNoError(err, "Error creating pvc") pvcClaims := []*v1.PersistentVolumeClaim{pvc} - pvs, err := e2epv.WaitForPVClaimBoundPhase(ctx, c, pvcClaims, framework.ClaimProvisionTimeout) - framework.ExpectNoError(err, "Failed waiting for PVC to be bound %v", err) - gomega.Expect(pvs).To(gomega.HaveLen(1)) ginkgo.By("Creating a pod with dynamically provisioned volume") podConfig := e2epod.Config{ @@ -121,5 +118,11 @@ func createPodPVCFromSC(ctx context.Context, f *framework.Framework, c clientset } pod, err := e2epod.CreateSecPod(ctx, c, &podConfig, f.Timeouts.PodStart) framework.ExpectNoError(err, "While creating pods for kubelet restart test") + + ginkgo.By("Checking for bound PVC") + pvs, err := e2epv.WaitForPVClaimBoundPhase(ctx, c, pvcClaims, framework.ClaimProvisionTimeout) + framework.ExpectNoError(err, "Failed waiting for PVC to be bound %v", err) + gomega.Expect(pvs).To(gomega.HaveLen(1)) + return pod, pvc, pvs[0] }