Set correct queue name

apache · Aug 27, 2024 · a713d24 · a713d24
1 parent 32fe2f4
commit a713d24
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/test/e2e/preemption/preemption_test.go b/test/e2e/preemption/preemption_test.go
@@ -164,7 +164,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 		})
 
 		// Define sleepPod
-		sleepPodConfigs := createSandbox1SleepPodCofigs(3, 600)
+		sleepPodConfigs := createSandbox1SleepPodCofigs(3, 600, "root.sandbox1")
 		sleepPod4Config := k8s.SleepPodConfig{Name: "sleepjob4", NS: dev, Mem: sleepPodMemLimit, Time: 600, Optedout: k8s.Allow, Labels: map[string]string{"queue": "root.sandbox2"}}
 		sleepPodConfigs = append(sleepPodConfigs, sleepPod4Config)
 
@@ -226,7 +226,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 		})
 
 		// Define sleepPod
-		sandbox1SleepPodConfigs := createSandbox1SleepPodCofigs(3, 30)
+		sandbox1SleepPodConfigs := createSandbox1SleepPodCofigs(3, 30, "root.sandbox1")
 		sleepPod4Config := k8s.SleepPodConfig{Name: "sleepjob4", NS: dev, Mem: sleepPodMemLimit, Time: 30, Optedout: k8s.Allow, Labels: map[string]string{"queue": "root.sandbox2"}}
 
 		// Deploy pods in root.sandbox1
@@ -292,7 +292,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 		})
 
 		// Define sleepPod
-		sandbox1SleepPodConfigs := createSandbox1SleepPodCofigs(3, 30)
+		sandbox1SleepPodConfigs := createSandbox1SleepPodCofigs(3, 30, "root.sandbox1")
 		sleepPod4Config := k8s.SleepPodConfig{Name: "sleepjob4", NS: dev, Mem: sleepPodMemLimit, Time: 30, Optedout: k8s.Allow, Labels: map[string]string{"queue": "root.sandbox2"}}
 
 		// Deploy pods in root.sandbox1
@@ -371,7 +371,7 @@ var _ = ginkgo.Describe("Preemption", func() {
 		})
 
 		// Define sleepPod
-		sandbox1SleepPodConfigs := createSandbox1SleepPodCofigs(3, 60)
+		sandbox1SleepPodConfigs := createSandbox1SleepPodCofigs(3, 60, "root.parent.sandbox1")
 		sleepPod4Config := k8s.SleepPodConfig{Name: "sleepjob4", NS: dev, Mem: sleepPodMemLimit, Time: 600, Optedout: k8s.Allow, Labels: map[string]string{"queue": "root.parent.low-priority"}}
 		sleepPod5Config := k8s.SleepPodConfig{Name: "sleepjob5", NS: dev, Mem: sleepPodMemLimit, Time: 600, Optedout: k8s.Allow, Labels: map[string]string{"queue": "root.parent.high-priority"}}
 
@@ -572,10 +572,10 @@ var _ = ginkgo.Describe("Preemption", func() {
 	})
 })
 
-func createSandbox1SleepPodCofigs(cnt, time int) []k8s.SleepPodConfig {
+func createSandbox1SleepPodCofigs(cnt, time int, queueName string) []k8s.SleepPodConfig {
 	sandbox1Configs := make([]k8s.SleepPodConfig, 0, cnt)
 	for i := 0; i < cnt; i++ {
-		sandbox1Configs = append(sandbox1Configs, k8s.SleepPodConfig{Name: fmt.Sprintf("sleepjob%d", i+1), NS: dev, Mem: sleepPodMemLimit, Time: time, Optedout: k8s.Allow, Labels: map[string]string{"queue": "root.parent.sandbox1"}})
+		sandbox1Configs = append(sandbox1Configs, k8s.SleepPodConfig{Name: fmt.Sprintf("sleepjob%d", i+1), NS: dev, Mem: sleepPodMemLimit, Time: time, Optedout: k8s.Allow, Labels: map[string]string{"queue": queueName}})
 	}
 	return sandbox1Configs
 }