From 3f7cf0b2870c05a7da2a2b76f983c570920961ac Mon Sep 17 00:00:00 2001 From: Piotr Kazmierczak <470696+pkazmierczak@users.noreply.github.com> Date: Thu, 2 Oct 2025 16:18:41 +0200 Subject: [PATCH] e2e: re-enable system scheduler tests (#26869) Do not merge until #26868 lands. --- e2e/scheduler_system/systemsched_test.go | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/e2e/scheduler_system/systemsched_test.go b/e2e/scheduler_system/systemsched_test.go index d130d0493..47eacdfe1 100644 --- a/e2e/scheduler_system/systemsched_test.go +++ b/e2e/scheduler_system/systemsched_test.go @@ -9,24 +9,22 @@ import ( "time" "github.com/hashicorp/nomad/api" + "github.com/hashicorp/nomad/e2e/v3/cluster3" "github.com/hashicorp/nomad/e2e/v3/jobs3" "github.com/hashicorp/nomad/nomad/structs" "github.com/shoenig/test/must" ) -// FIXME: these tests are temporarily disabled until a bug in the scheduler that -// fails to account for constraints is fixed. -// -// func TestSystemScheduler(t *testing.T) { -// cluster3.Establish(t, -// cluster3.Leader(), -// cluster3.LinuxClients(3), -// ) -// -// t.Run("testJobUpdateOnIneligibleNode", testJobUpdateOnIneligbleNode) -// t.Run("testCanaryUpdate", testCanaryUpdate) -// t.Run("testCanaryDeploymentToAllEligibleNodes", testCanaryDeploymentToAllEligibleNodes) -// } +func TestSystemScheduler(t *testing.T) { + cluster3.Establish(t, + cluster3.Leader(), + cluster3.LinuxClients(3), + ) + + t.Run("testJobUpdateOnIneligibleNode", testJobUpdateOnIneligbleNode) + t.Run("testCanaryUpdate", testCanaryUpdate) + t.Run("testCanaryDeploymentToAllEligibleNodes", testCanaryDeploymentToAllEligibleNodes) +} func testJobUpdateOnIneligbleNode(t *testing.T) { job, cleanup := jobs3.Submit(t,