Fix pod creation len test error.

Author: Singularity23x0

test/e2e/singlecluster/baseline/pod_test.go

@@ -36,28 +36,9 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/pod"
 	podconstants "sigs.k8s.io/kueue/pkg/controller/jobs/pod/constants"
-	"sigs.k8s.io/kueue/pkg/features"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
 	utiltestingapi "sigs.k8s.io/kueue/pkg/util/testing/v1beta2"
-	testingappwrapper "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
-	testingdeployment "sigs.k8s.io/kueue/pkg/util/testingjobs/deployment"
-	testingjaxjob "sigs.k8s.io/kueue/pkg/util/testingjobs/jaxjob"
-	testingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
-	testingjobset "sigs.k8s.io/kueue/pkg/util/testingjobs/jobset"
-	testingleaderworkerset "sigs.k8s.io/kueue/pkg/util/testingjobs/leaderworkerset"
-	testingmpijob "sigs.k8s.io/kueue/pkg/util/testingjobs/mpijob"
-	testingpaddlejob "sigs.k8s.io/kueue/pkg/util/testingjobs/paddlejob"
 	podtesting "sigs.k8s.io/kueue/pkg/util/testingjobs/pod"
-	testingpytorchjob "sigs.k8s.io/kueue/pkg/util/testingjobs/pytorchjob"
-	testingraycluster "sigs.k8s.io/kueue/pkg/util/testingjobs/raycluster"
-	testingrayjob "sigs.k8s.io/kueue/pkg/util/testingjobs/rayjob"
-	testingrayservice "sigs.k8s.io/kueue/pkg/util/testingjobs/rayservice"
-	testingsparkapplication "sigs.k8s.io/kueue/pkg/util/testingjobs/sparkapplication"
-	testingstatefulset "sigs.k8s.io/kueue/pkg/util/testingjobs/statefulset"
-	testingtfjob "sigs.k8s.io/kueue/pkg/util/testingjobs/tfjob"
-	testingtrainjob "sigs.k8s.io/kueue/pkg/util/testingjobs/trainjob"
-	testingxgboostjob "sigs.k8s.io/kueue/pkg/util/testingjobs/xgboostjob"
-	"sigs.k8s.io/kueue/pkg/workload"
 	"sigs.k8s.io/kueue/test/util"
 )
 
@@ -641,261 +622,8 @@ var _ = ginkgo.Describe("Pod groups", ginkgo.Label("area:singlecluster", "featur
 					g.Expect(k8sClient.Get(ctx, pKey, &corev1.Pod{})).To(utiltesting.BeNotFoundError())
 				}, util.Timeout, util.Interval).Should(gomega.Succeed())
 
-				gKey := client.ObjectKey{Namespace: ns.Name, Name: "test-group"}
-				util.ExpectWorkloadsFinalizedOrGone(ctx, k8sClient, gKey)
 			})
 		})
 	})
 })
 
-var _ = ginkgo.Describe("Pod labels", ginkgo.Label("area:singlecluster", "feature:pod", "feature:scheduler-library"), func() {
-	var ns *corev1.Namespace
-	var lq *kueue.LocalQueue
-	var cq *kueue.ClusterQueue
-
-	ginkgo.BeforeEach(func() {
-		features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.SchedulerLibraryIntegration, true)
-		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "e2e-scheduler-lib-")
-
-		rf := utiltestingapi.MakeResourceFlavor("rf").Obj()
-		util.MustCreate(ctx, k8sClient, rf)
-
-		cq = utiltestingapi.MakeClusterQueue("cq").
-			ResourceGroup(*utiltestingapi.MakeFlavorQuotas("rf").Resource(corev1.ResourceCPU, "10").Obj()).
-			Obj()
-		util.MustCreate(ctx, k8sClient, cq)
-
-		lq = utiltestingapi.MakeLocalQueue("lq", ns.Name).ClusterQueue(cq.Name).Obj()
-		util.MustCreate(ctx, k8sClient, lq)
-	})
-
-	ginkgo.AfterEach(func() {
-		gomega.Expect(util.DeleteNamespace(ctx, k8sClient, ns)).To(gomega.Succeed())
-	})
-
-	type jobConfig struct {
-		name      string
-		createObj func(nsName, queueName string) client.Object
-	}
-
-	configs := []jobConfig{
-		{
-			name: "BatchJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingjob.MakeJob("test-batch-job", nsName).
-					Queue(kueue.LocalQueueName(queueName)).
-					Image(util.GetAgnHostImage(), util.BehaviorWaitForDeletion).
-					RequestAndLimit(corev1.ResourceCPU, "1").
-					Obj()
-			},
-		},
-		{
-			name: "PodGroup",
-			createObj: func(nsName, queueName string) client.Object {
-				p := podtesting.MakePod("test-pod-0", nsName).
-					Queue(queueName).
-					Image(util.GetAgnHostImage(), util.BehaviorWaitForDeletion).
-					RequestAndLimit(corev1.ResourceCPU, "1").
-					Obj()
-				pod.SetPodGroupName(p, "test-pod-group")
-				p.Annotations[podconstants.GroupTotalCountAnnotation] = "1"
-				return p
-			},
-		},
-		{
-			name: "StatefulSet",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingstatefulset.MakeStatefulSet("test-sts", nsName).
-					Queue(queueName).
-					Image(util.GetAgnHostImage(), util.BehaviorWaitForDeletion).
-					RequestAndLimit(corev1.ResourceCPU, "1").
-					Replicas(1).
-					Obj()
-			},
-		},
-		{
-			name: "Deployment",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingdeployment.MakeDeployment("test-deploy", nsName).
-					Queue(queueName).
-					Image(util.GetAgnHostImage(), util.BehaviorWaitForDeletion).
-					RequestAndLimit(corev1.ResourceCPU, "1").
-					Replicas(1).
-					Obj()
-			},
-		},
-		{
-			name: "JobSet",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingjobset.MakeJobSet("test-jobset", nsName).
-					Queue(queueName).
-					ReplicatedJobs(testingjobset.ReplicatedJobRequirements{
-						Name:        "replicated-job",
-						Replicas:    1,
-						Parallelism: 1,
-						Completions: 1,
-						Image:       util.GetAgnHostImage(),
-					}).
-					Obj()
-			},
-		},
-		{
-			name: "LeaderWorkerSet",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingleaderworkerset.MakeLeaderWorkerSet("test-lws", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "PyTorchJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingpytorchjob.MakePyTorchJob("test-pytorch", nsName).
-					PyTorchReplicaSpecsDefault().
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "TFJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingtfjob.MakeTFJob("test-tf", nsName).
-					TFReplicaSpecsDefault().
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "MPIJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingmpijob.MakeMPIJob("test-mpi", nsName).
-					GenericLauncherAndWorker().
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "PaddleJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingpaddlejob.MakePaddleJob("test-paddle", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "XGBoostJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingxgboostjob.MakeXGBoostJob("test-xgboost", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "JAXJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingjaxjob.MakeJAXJob("test-jax", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "RayJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingrayjob.MakeJob("test-rayjob", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "RayCluster",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingraycluster.MakeCluster("test-raycluster", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "RayService",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingrayservice.MakeService("test-rayservice", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "AppWrapper",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingappwrapper.MakeAppWrapper("test-appwrapper", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "TrainJob",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingtrainjob.MakeTrainJob("test-trainjob", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-		{
-			name: "SparkApplication",
-			createObj: func(nsName, queueName string) client.Object {
-				return testingsparkapplication.MakeSparkApplication("test-spark", nsName).
-					Queue(queueName).
-					Obj()
-			},
-		},
-	}
-
-	for _, tc := range configs {
-		ginkgo.It(fmt.Sprintf("Should admit %s and correctly match created pods using MatchPods", tc.name), func() {
-			noisePod := podtesting.MakePod("noise-pod", ns.Name).
-				Queue(lq.Name).
-				Image(util.GetAgnHostImage(), util.BehaviorWaitForDeletion).
-				RequestAndLimit(corev1.ResourceCPU, "1").
-				Obj()
-			pod.SetPodGroupName(noisePod, "noise-group")
-			noisePod.Annotations[podconstants.GroupTotalCountAnnotation] = "1"
-			util.MustCreate(ctx, k8sClient, noisePod)
-
-			obj := tc.createObj(ns.Name, lq.Name)
-			util.MustCreate(ctx, k8sClient, obj)
-
-			var wlList kueue.WorkloadList
-			gomega.Eventually(func(g gomega.Gomega) {
-				g.Expect(k8sClient.List(ctx, &wlList, client.InNamespace(ns.Name))).To(gomega.Succeed())
-				g.Expect(wlList.Items).To(gomega.HaveLen(2))
-			}, util.Timeout, util.Interval).Should(gomega.Succeed())
-
-			var targetWl *kueue.Workload
-			for i := range wlList.Items {
-				if wlList.Items[i].Name != "noise-group" {
-					targetWl = &wlList.Items[i]
-					break
-				}
-			}
-			gomega.Expect(targetWl).NotTo(gomega.BeNil(), "target workload should exist")
-			util.ExpectWorkloadsToBeAdmittedByKeys(ctx, k8sClient, client.ObjectKeyFromObject(targetWl))
-
-			var podList corev1.PodList
-			gomega.Eventually(func(g gomega.Gomega) {
-				g.Expect(k8sClient.List(ctx, &podList, client.InNamespace(ns.Name))).To(gomega.Succeed())
-				g.Expect(podList.Items).To(gomega.HaveLen(2))
-
-				var allPods []*corev1.Pod
-				var targetPods []*corev1.Pod
-				for i := range podList.Items {
-					p := &podList.Items[i]
-					allPods = append(allPods, p)
-					if p.Name != "noise-pod" {
-						targetPods = append(targetPods, p)
-					}
-				}
-
-				matched := workload.MatchPods(targetWl, allPods)
-				g.Expect(matched).To(gomega.ConsistOf(targetPods), "MatchPods should return only target pods for workload %s", targetWl.Name)
-			}, util.Timeout, util.Interval).Should(gomega.Succeed())
-		})
-	}
-})