From 5c9eee908b42d3ff4f48043bb86b2478a2f7cbc2 Mon Sep 17 00:00:00 2001
From: Mykhailo Bobrovskyi <mikhail.bobrovsky@gmail.com>
Date: Tue, 2 Jul 2024 09:02:57 +0300
Subject: [PATCH] Clean jobsets on delete namespace. (#2505)

---
 test/util/util.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/util/util.go b/test/util/util.go
index 3e26c8dbf9..fbb8516f80 100644
--- a/test/util/util.go
+++ b/test/util/util.go
@@ -18,6 +18,7 @@ package util
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"time"
@@ -114,6 +115,9 @@ func DeleteNamespace(ctx context.Context, c client.Client, ns *corev1.Namespace)
 	if ns == nil {
 		return nil
 	}
+	if err := DeleteAllJobsetsInNamespace(ctx, c, ns); err != nil {
+		return err
+	}
 	if err := DeleteAllJobsInNamespace(ctx, c, ns); err != nil {
 		return err
 	}
@@ -146,7 +150,7 @@ func DeleteAllJobsInNamespace(ctx context.Context, c client.Client, ns *corev1.N
 
 func DeleteAllJobsetsInNamespace(ctx context.Context, c client.Client, ns *corev1.Namespace) error {
 	err := c.DeleteAllOf(ctx, &jobset.JobSet{}, client.InNamespace(ns.Name), client.PropagationPolicy(metav1.DeletePropagationBackground))
-	if err != nil && !apierrors.IsNotFound(err) {
+	if err != nil && !apierrors.IsNotFound(err) && !errors.Is(err, &apimeta.NoKindMatchError{}) {
 		return err
 	}
 	return nil