bugfix: use env datacenter

Signed-off-by: Jorge Aguilera <[email protected]>
nextflow-io · Jul 2, 2024 · 340447b · 340447b
1 parent 294818d
commit 340447b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/plugins/nf-nomad/build.gradle b/plugins/nf-nomad/build.gradle
@@ -97,6 +97,7 @@ test {
     useJUnitPlatform()
     jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
     environment 'NOMAD_ADDR', 'http://test-nf-nomad'
+    environment 'NOMAD_DC', 'dc-test'
 }
 
 jar {

diff --git a/plugins/nf-nomad/src/main/nextflow/nomad/config/NomadJobOpts.groovy b/plugins/nf-nomad/src/main/nextflow/nomad/config/NomadJobOpts.groovy
@@ -53,7 +53,9 @@ class NomadJobOpts{
                     nomadJobOpts.datacenters : nomadJobOpts.datacenters.toString().split(","))
                     as List<String>).findAll{it.size()}.unique()
         }else{
-            datacenters = (sysEnv.get('NOMAD_DC')?:"").split(",") as List<String>
+            if( sysEnv.containsKey('NOMAD_DC')) {
+                datacenters = sysEnv.get('NOMAD_DC').split(",") as List<String>
+            }
         }
 
         region = nomadJobOpts.region ?: sysEnv.get('NOMAD_REGION')

diff --git a/plugins/nf-nomad/src/test/nextflow/nomad/NomadConfigSpec.groovy b/plugins/nf-nomad/src/test/nextflow/nomad/NomadConfigSpec.groovy
@@ -90,7 +90,7 @@ class NomadConfigSpec extends Specification {
         ])
 
         expect:
-        config.jobOpts.datacenters
+        config.jobOpts.datacenters == List.of('dc-test')
     }
 
     void "should use datacenters #dc with size #size if provided"() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ class NomadConfigSpec extends Specification { @@
             ])
             expect:
-            config.jobOpts.datacenters
+            config.jobOpts.datacenters == List.of('dc-test')
         }
         void "should use datacenters #dc with size #size if provided"() {
@@ Expand Down @@