From 05e3d4b667ba96061893e9cd3f99e4df65066e56 Mon Sep 17 00:00:00 2001 From: Jorge Aguilera Date: Fri, 29 Mar 2024 21:53:38 +0100 Subject: [PATCH] upgrade to nomad 1.7 Signed-off-by: Jorge Aguilera --- plugins/nf-nomad/build.gradle | 4 ++-- .../nomad/executor/NomadService.groovy | 24 +++++++++---------- .../nomad/executor/NomadTaskHandler.groovy | 4 ++-- .../nomad/executor/NomadServiceSpec.groovy | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/nf-nomad/build.gradle b/plugins/nf-nomad/build.gradle index 2e04bb1..675b268 100644 --- a/plugins/nf-nomad/build.gradle +++ b/plugins/nf-nomad/build.gradle @@ -35,7 +35,6 @@ repositories { maven { url = 'https://jitpack.io' } maven { url = 'https://s3-eu-west-1.amazonaws.com/maven.seqera.io/releases' } maven { url = 'https://s3-eu-west-1.amazonaws.com/maven.seqera.io/snapshots' } - maven { url "https://repo.clojars.org" } } configurations { @@ -67,7 +66,8 @@ dependencies { // add here plugins depepencies // source the custom published version - implementation "org.clojars.abhi18av:nomad-client-java:1.1.4" + // implementation "org.clojars.abhi18av:nomad-client-java:1.1.4" + implementation "es.edn:nomad-client-java:1.7.6" // test configuration diff --git a/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy b/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy index 7926229..b91cd04 100644 --- a/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy +++ b/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy @@ -21,18 +21,18 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import io.nomadproject.client.ApiClient import io.nomadproject.client.api.JobsApi -import io.nomadproject.client.models.AllocationListStub -import io.nomadproject.client.models.Job -import io.nomadproject.client.models.JobRegisterRequest -import io.nomadproject.client.models.JobRegisterResponse -import io.nomadproject.client.models.JobSummary -import io.nomadproject.client.models.ReschedulePolicy -import io.nomadproject.client.models.Resources -import io.nomadproject.client.models.RestartPolicy -import io.nomadproject.client.models.Task -import io.nomadproject.client.models.TaskGroup -import io.nomadproject.client.models.VolumeMount -import io.nomadproject.client.models.VolumeRequest +import io.nomadproject.client.model.AllocationListStub +import io.nomadproject.client.model.Job +import io.nomadproject.client.model.JobRegisterRequest +import io.nomadproject.client.model.JobRegisterResponse +import io.nomadproject.client.model.JobSummary +import io.nomadproject.client.model.ReschedulePolicy +import io.nomadproject.client.model.Resources +import io.nomadproject.client.model.RestartPolicy +import io.nomadproject.client.model.Task +import io.nomadproject.client.model.TaskGroup +import io.nomadproject.client.model.VolumeMount +import io.nomadproject.client.model.VolumeRequest import nextflow.nomad.NomadConfig import nextflow.processor.TaskRun import nextflow.util.MemoryUnit diff --git a/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadTaskHandler.groovy b/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadTaskHandler.groovy index 84466ee..d449f2a 100644 --- a/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadTaskHandler.groovy +++ b/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadTaskHandler.groovy @@ -19,8 +19,8 @@ package nextflow.nomad.executor import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import io.nomadproject.client.models.Resources -import io.nomadproject.client.models.TaskGroupSummary +import io.nomadproject.client.model.Resources +import io.nomadproject.client.model.TaskGroupSummary import nextflow.exception.ProcessSubmitException import nextflow.exception.ProcessUnrecoverableException import nextflow.executor.BashWrapperBuilder diff --git a/plugins/nf-nomad/src/test/nextflow/nomad/executor/NomadServiceSpec.groovy b/plugins/nf-nomad/src/test/nextflow/nomad/executor/NomadServiceSpec.groovy index effa1f6..78b7243 100644 --- a/plugins/nf-nomad/src/test/nextflow/nomad/executor/NomadServiceSpec.groovy +++ b/plugins/nf-nomad/src/test/nextflow/nomad/executor/NomadServiceSpec.groovy @@ -18,7 +18,7 @@ package nextflow.nomad.executor import groovy.json.JsonOutput import groovy.json.JsonSlurper -import io.nomadproject.client.models.Resources +import io.nomadproject.client.model.Resources import nextflow.executor.Executor import nextflow.nomad.NomadConfig import nextflow.processor.TaskBean