diff --git a/go.mod b/go.mod index affe13c07..d69180bed 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ module github.com/apache/yunikorn-k8shim go 1.25.0 require ( - github.com/apache/yunikorn-core v0.0.0-20260529102538-fad16fdb6992 + github.com/apache/yunikorn-core v0.0.0-20260605065500-fae6e256cd5c github.com/apache/yunikorn-scheduler-interface v0.0.0-20260528033204-c474acff6d53 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index c8762c559..4fea3b636 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktp github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= -github.com/apache/yunikorn-core v0.0.0-20260529102538-fad16fdb6992 h1:eOO7ADGZwpv8yc/bNMA2TQFq1izvzuisZdjj+POHHj4= -github.com/apache/yunikorn-core v0.0.0-20260529102538-fad16fdb6992/go.mod h1:yxn4stqkqgiSNYqOyulBHf9IgyTBM+rFrzWcyicueKU= +github.com/apache/yunikorn-core v0.0.0-20260605065500-fae6e256cd5c h1:iuShQ3op12fL+jQ420ZQLsgyDp/1L1/ygi9ZG8awvko= +github.com/apache/yunikorn-core v0.0.0-20260605065500-fae6e256cd5c/go.mod h1:yxn4stqkqgiSNYqOyulBHf9IgyTBM+rFrzWcyicueKU= github.com/apache/yunikorn-scheduler-interface v0.0.0-20260528033204-c474acff6d53 h1:zodKoODatR57zSGoQGdQ8EZjJgQqy9nh5/yxmI9hWpI= github.com/apache/yunikorn-scheduler-interface v0.0.0-20260528033204-c474acff6d53/go.mod h1:XygReHrRd3TtfNS3uVtRQI0sCOfprcLUfhlmv/LdCmk= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= diff --git a/test/e2e/quota-preemption/quota_preemption_test.go b/test/e2e/quota-preemption/quota_preemption_test.go index d9bde2e07..d7db5552b 100644 --- a/test/e2e/quota-preemption/quota_preemption_test.go +++ b/test/e2e/quota-preemption/quota_preemption_test.go @@ -294,7 +294,7 @@ var _ = ginkgo.Describe("QuotaPreemption", func() { }, 5*time.Second, time.Second).Should(gomega.Succeed()) }) - ginkgo.PIt("Needs Investigation - Quota_Preemption_Delay_Inherited_From_Parent", func() { + ginkgo.It("Quota_Preemption_Delay_Inherited_From_Parent", func() { ginkgo.By("Quota preemption delay set on parent queue should be inherited by child queues that do not set it explicitly.") // Apply initial config: parent has quota.preemption.delay=20s, child (queue-a) has no delay set. @@ -313,7 +313,9 @@ var _ = ginkgo.Describe("QuotaPreemption", func() { Ω(err).NotTo(gomega.HaveOccurred()) ginkgo.By("Waiting for all 3 deployment pods to be running") - err = kClient.WaitForPodBySelectorRunning(dev, "app=app-a", 30) + err = kClient.WaitForPodBySelector(dev, "app=app-a", 20*time.Second) + Ω(err).NotTo(gomega.HaveOccurred()) + err = kClient.WaitForPodBySelectorRunning(dev, "app=app-a", 10) Ω(err).NotTo(gomega.HaveOccurred()) ginkgo.By("All 3 pods are running before quota is reduced")