diff --git a/Makefile b/Makefile index 2190e3914a..e9a555d49f 100644 --- a/Makefile +++ b/Makefile @@ -850,6 +850,7 @@ GINKGO_FLAGS = --vv \ --no-color=$(OPENSHIFT_CI) \ --label-filter="$(TEST_FILTER)" \ --junit-report="$(ARTIFACT_DIR)/junit_report.xml" \ + --fail-fast=false --timeout=2h .PHONY: test-e2e diff --git a/tests/e2e/lib/k8s_common_helpers.go b/tests/e2e/lib/k8s_common_helpers.go index b7bb9e2767..9aba5778df 100755 --- a/tests/e2e/lib/k8s_common_helpers.go +++ b/tests/e2e/lib/k8s_common_helpers.go @@ -17,6 +17,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" + "k8s.io/utils/ptr" ) type ProxyPodParameters struct { @@ -296,7 +297,7 @@ func DeleteAllPVCsInNamespace(clientset *kubernetes.Clientset, namespace string) // Delete each PVC for _, pvc := range pvcList.Items { log.Printf("Deleting PVC %s in namespace %s", pvc.Name, namespace) - err := clientset.CoreV1().PersistentVolumeClaims(namespace).Delete(ctx, pvc.Name, metav1.DeleteOptions{}) + err := clientset.CoreV1().PersistentVolumeClaims(namespace).Delete(ctx, pvc.Name, metav1.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))}) if err != nil && !apierrors.IsNotFound(err) { log.Printf("Warning: Failed to delete PVC %s in namespace %s: %v", pvc.Name, namespace, err) }