e2e: corrections to system deployment tests (#27054)

Author: pkazmierczak

e2e/scheduler_system/input/system_canary_v0.nomad.hcl

@@ -30,18 +30,11 @@ job "system_job" {
       mode  = "delay"
     }
 
-    task "system_task" {
-      driver = "docker"
-
+    task "sleepy" {
+      driver = "raw_exec"
       config {
-        image = "busybox:1"
-
-        command = "/bin/sh"
-        args    = ["-c", "sleep 15000"]
-      }
-
-      env {
-        version = "0"
+        command = "/bin/sleep"
+        args    = ["1000m"]
       }
     }
   }

e2e/scheduler_system/input/system_canary_v0_100.nomad.hcl

@@ -28,18 +28,11 @@ job "system_job" {
       mode  = "delay"
     }
 
-    task "system_task" {
-      driver = "docker"
-
+    task "sleepy" {
+      driver = "raw_exec"
       config {
-        image = "busybox:1"
-
-        command = "/bin/sh"
-        args    = ["-c", "sleep 15000"]
-      }
-
-      env {
-        version = "0"
+        command = "/bin/sleep"
+        args    = ["1000m"]
       }
     }
   }

e2e/scheduler_system/input/system_canary_v1.nomad.hcl

@@ -30,18 +30,11 @@ job "system_job" {
       mode  = "delay"
     }
 
-    task "system_task" {
-      driver = "docker"
-
+    task "sleepy" {
+      driver = "raw_exec"
       config {
-        image = "busybox:1"
-
-        command = "/bin/sh"
-        args    = ["-c", "sleep 150000"]
-      }
-
-      env {
-        version = "1"
+        command = "/bin/sleep"
+        args    = ["100m"]
       }
     }
   }

e2e/scheduler_system/input/system_canary_v1_100.nomad.hcl

@@ -28,18 +28,11 @@ job "system_job" {
       mode  = "delay"
     }
 
-    task "system_task" {
-      driver = "docker"
-
+    task "sleepy" {
+      driver = "raw_exec"
       config {
-        image = "busybox:1"
-
-        command = "/bin/sh"
-        args    = ["-c", "sleep 150000"]
-      }
-
-      env {
-        version = "1"
+        command = "/bin/sleep"
+        args    = ["100m"]
       }
     }
   }

e2e/scheduler_system/systemsched_test.go

@@ -114,10 +114,6 @@ func testCanaryUpdate(t *testing.T) {
 	)
 	t.Cleanup(cleanup2)
 
-	// Get updated allocations
-	allocs := job2.Allocs()
-	must.SliceNotEmpty(t, allocs)
-
 	deploymentsApi := job2.DeploymentsApi()
 	deploymentsList, _, err := deploymentsApi.List(nil)
 	must.NoError(t, err)
@@ -131,7 +127,7 @@ func testCanaryUpdate(t *testing.T) {
 	must.NotNil(t, deployment)
 
 	// wait for the canary allocations to become healthy
-	timeout, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	timeout, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancel()
 
 	job2.WaitForDeploymentFunc(timeout, deployment.ID, func(d *api.Deployment) bool {
@@ -143,6 +139,10 @@ func testCanaryUpdate(t *testing.T) {
 		return false
 	})
 
+	// Get updated allocations
+	allocs := job2.Allocs()
+	must.SliceNotEmpty(t, allocs)
+
 	// find allocations from v1 version of the job, they should all be canaries
 	// and there should be exactly 50% (rounded up) of v0 allocations
 	count := 0
@@ -231,7 +231,7 @@ func testCanaryDeploymentToAllEligibleNodes(t *testing.T) {
 	must.NotNil(t, deployment)
 
 	// wait for the canary allocations to become healthy
-	timeout, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	timeout, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancel()
 
 	job2.WaitForDeploymentFunc(timeout, deployment.ID, func(d *api.Deployment) bool {