From 74c1828431dcf77895fc7109e12a23a827041874 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Wed, 13 Jan 2021 14:00:40 -0600 Subject: [PATCH] e2e: use jobspec2 Parse for parsing jobfile in e2e utils We directly parse job files in e2eutil, but currently using jobspec package. Instead, use the Parse method from the jobspec2 package so we can parse job files with new features. --- e2e/e2eutil/utils.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/e2e/e2eutil/utils.go b/e2e/e2eutil/utils.go index 6cf10d574..222413b5e 100644 --- a/e2e/e2eutil/utils.go +++ b/e2e/e2eutil/utils.go @@ -2,6 +2,7 @@ package e2eutil import ( "fmt" + "os" "strings" "testing" "time" @@ -9,7 +10,7 @@ import ( consulapi "github.com/hashicorp/consul/api" "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/nomad/jobspec" + "github.com/hashicorp/nomad/jobspec2" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/testutil" "github.com/kr/pretty" @@ -63,10 +64,16 @@ func stringToPtrOrNil(s string) *string { return helper.StringToPtr(s) } +func Parse2(t *testing.T, jobFile string) (*api.Job, error) { + f, err := os.Open(jobFile) + require.NoError(t, err) + return jobspec2.Parse(jobFile, f) +} + func RegisterAllocs(t *testing.T, nomadClient *api.Client, jobFile, jobID, cToken string) []*api.AllocationListStub { // Parse job - job, err := jobspec.ParseFile(jobFile) + job, err := Parse2(t, jobFile) require.NoError(t, err) // Set custom job ID (distinguish among tests)