diff --git a/internal/nomad/job.go b/internal/nomad/job.go index 3acbfa1..b5e9f3c 100644 --- a/internal/nomad/job.go +++ b/internal/nomad/job.go @@ -113,6 +113,8 @@ func createTaskGroup(job *nomadApi.Job, name string) *nomadApi.TaskGroup { return taskGroup } +const portNumberBase = 10 + func configureNetwork(taskGroup *nomadApi.TaskGroup, networkAccess bool, exposedPorts []uint16) { if len(taskGroup.Tasks) == 0 { // This function is only used internally and must be called as last step when configuring the task. @@ -138,7 +140,7 @@ func configureNetwork(taskGroup *nomadApi.TaskGroup, networkAccess bool, exposed networkResource.Mode = "bridge" for _, portNumber := range exposedPorts { port := nomadApi.Port{ - Label: strconv.FormatUint(uint64(portNumber), 10), + Label: strconv.FormatUint(uint64(portNumber), portNumberBase), To: int(portNumber), } networkResource.DynamicPorts = append(networkResource.DynamicPorts, port) diff --git a/tests/helpers/test_helpers.go b/tests/helpers/test_helpers.go index bffa203..b2be89f 100644 --- a/tests/helpers/test_helpers.go +++ b/tests/helpers/test_helpers.go @@ -171,9 +171,11 @@ func HTTPPutJSON(url string, body interface{}) (response *http.Response, err err return HTTPPut(url, reader) } +const templateJobPriority = 100 + func CreateTemplateJob() (base, job *nomadApi.Job) { - base = nomadApi.NewBatchJob(tests.DefaultJobID, tests.DefaultJobID, "region-name", 100) - job = nomadApi.NewBatchJob(tests.DefaultJobID, tests.DefaultJobID, "region-name", 100) + base = nomadApi.NewBatchJob(tests.DefaultJobID, tests.DefaultJobID, "region-name", templateJobPriority) + job = nomadApi.NewBatchJob(tests.DefaultJobID, tests.DefaultJobID, "region-name", templateJobPriority) configTaskGroup := nomadApi.NewTaskGroup("config", 0) configTaskGroup.Meta = make(map[string]string) configTaskGroup.Meta["prewarmingPoolSize"] = "0"