Add e2e test for different task resources

Author: Jeffwan

test/e2e/job.go

@@ -105,7 +105,7 @@ var _ = Describe("Job E2E Test", func() {
 		err = waitPodGroupPending(context, pg)
 		Expect(err).NotTo(HaveOccurred())
 
-		waitPodGroupUnschedulable(context, pg)
+		err = waitPodGroupUnschedulable(context, pg)
 		Expect(err).NotTo(HaveOccurred())
 
 		err = deleteReplicaSet(context, replicaset.Name)
@@ -325,4 +325,48 @@ var _ = Describe("Job E2E Test", func() {
 		err = waitTasksReadyEx(context, pg, expteced)
 		Expect(err).NotTo(HaveOccurred())
 	})
+
+	It("Try to fit unassigned task with different resource requests in one loop", func() {
+		context := initTestContext()
+		defer cleanupTestContext(context)
+
+		slot := oneCPU
+		rep := clusterSize(context, slot)
+
+		replicaset := createReplicaSet(context, "rs-1", rep/2, "nginx", slot)
+		err := waitReplicaSetReady(context, replicaset.Name)
+		Expect(err).NotTo(HaveOccurred())
+
+		_, pg := createJobEx(context, &jobSpec{
+			name: "multi-pod-job",
+			tasks: []taskSpec{
+				{
+					img: "nginx",
+					pri: masterPriority, // make sure task require more resource rank higher
+					min: rep/2 + 1,
+					rep: rep/2 + 1,
+					req: oneCPU,
+				},
+				{
+					img: "nginx",
+					pri: workerPriority,
+					min: 1,
+					rep: 1,
+					req: minMilliCPU,
+				},
+			},
+		})
+
+		err = waitPodGroupPending(context, pg)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = waitPodGroupUnschedulable(context, pg)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = deleteReplicaSet(context, replicaset.Name)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = waitPodGroupReady(context, pg)
+		Expect(err).NotTo(HaveOccurred())
+	})
 })

test/e2e/util.go

@@ -47,6 +47,8 @@ import (
 
 var oneMinute = 1 * time.Minute
 
+// Task with resource lower than minMilliCPU will be considered as BestEffort and skipped in allocate action
+var minMilliCPU = v1.ResourceList{"cpu": resource.MustParse("10m")}
 var oneCPU = v1.ResourceList{"cpu": resource.MustParse("1000m")}
 var twoCPU = v1.ResourceList{"cpu": resource.MustParse("2000m")}
 var threeCPU = v1.ResourceList{"cpu": resource.MustParse("3000m")}