diff --git a/e2e/e2eutil/utils.go b/e2e/e2eutil/utils.go index 0e6e704de..7cc3bea62 100644 --- a/e2e/e2eutil/utils.go +++ b/e2e/e2eutil/utils.go @@ -147,7 +147,7 @@ func WaitForAllocNotPending(t *testing.T, nomadClient *api.Client, allocID strin return false, err } - return alloc.ClientStatus != structs.AllocClientStatusPending, fmt.Errorf("expected status running, but was: %s", alloc.ClientStatus) + return alloc.ClientStatus != structs.AllocClientStatusPending, fmt.Errorf("expected status not pending, but was: %s", alloc.ClientStatus) }, func(err error) { t.Fatalf("failed to wait on alloc: %v", err) }) diff --git a/e2e/systemsched/input/system_job0.nomad b/e2e/systemsched/input/system_job0.nomad index 6c881e096..3697aa2c4 100644 --- a/e2e/systemsched/input/system_job0.nomad +++ b/e2e/systemsched/input/system_job0.nomad @@ -1,4 +1,4 @@ -job "redis" { +job "system_job" { datacenters = ["dc1"] type = "system" @@ -8,7 +8,7 @@ job "redis" { value = "linux" } - group "cache" { + group "system_job_group" { count = 1 restart { @@ -32,22 +32,6 @@ job "redis" { env { version = "1" } - - logs { - max_files = 1 - max_file_size = 9 - } - - resources { - cpu = 20 # 500 MHz - - memory = 40 # 256MB - - network { - mbits = 1 - port "db" {} - } - } } } } diff --git a/e2e/systemsched/input/system_job1.nomad b/e2e/systemsched/input/system_job1.nomad index aae1729c6..ab53e5ff4 100644 --- a/e2e/systemsched/input/system_job1.nomad +++ b/e2e/systemsched/input/system_job1.nomad @@ -1,4 +1,4 @@ -job "redis" { +job "system_job" { datacenters = ["dc1"] type = "system" @@ -8,7 +8,7 @@ job "redis" { value = "linux" } - group "cache" { + group "system_job_group" { count = 1 restart { @@ -32,22 +32,6 @@ job "redis" { env { version = "2" } - - logs { - max_files = 1 - max_file_size = 9 - } - - resources { - cpu = 20 # 500 MHz - - memory = 40 # 256MB - - network { - mbits = 1 - port "db" {} - } - } } } }