Merge remote-tracking branch 'origin/develop' into fix/restartb_archi…

…ving * origin/develop: Hotfix for undefined CLUSTERS (NOAA-EMC#2748)
DavidHuber-NOAA · Jul 3, 2024 · 3ece3aa · 3ece3aa
2 parents 62aeca5 + 2bd106a
commit 3ece3aa
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 1 deletion.
diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml
@@ -14,6 +14,7 @@ QUEUE_SERVICE: batch
 PARTITION_BATCH: compute
 PARTITION_SERVICE: compute
 RESERVATION: ''
+CLUSTERS: ''
 CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported.
 HPSSARCH: 'YES'

diff --git a/workflow/hosts/container.yaml b/workflow/hosts/container.yaml
@@ -14,6 +14,7 @@ QUEUE_SERVICE: ''
 PARTITION_BATCH: ''
 PARTITION_SERVICE: ''
 RESERVATION: ''
+CLUSTERS: ''
 CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod'
 HPSSARCH: 'NO'

diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
@@ -16,6 +16,7 @@ PARTITION_BATCH: hera
 PARTITION_SERVICE: service
 RESERVATION: ''
 CHGRP_RSTPROD: 'YES'
+CLUSTERS: ''
 CHGRP_CMD: 'chgrp rstprod'
 HPSSARCH: 'YES'
 HPSS_PROJECT: emc-global

diff --git a/workflow/hosts/hercules.yaml b/workflow/hosts/hercules.yaml
@@ -16,6 +16,7 @@ PARTITION_BATCH: hercules
 PARTITION_SERVICE: service
 RESERVATION: ''
 CHGRP_RSTPROD: 'YES'
+CLUSTERS: ''
 CHGRP_CMD: 'chgrp rstprod'
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global

diff --git a/workflow/hosts/jet.yaml b/workflow/hosts/jet.yaml
@@ -16,6 +16,7 @@ PARTITION_BATCH: kjet
 PARTITION_SERVICE: service
 RESERVATION: ''
 CHGRP_RSTPROD: 'YES'
+CLUSTERS: ''
 CHGRP_CMD: 'chgrp rstprod'
 HPSSARCH: 'YES'
 HPSS_PROJECT: emc-global

diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml
@@ -16,6 +16,7 @@ PARTITION_BATCH: orion
 PARTITION_SERVICE: service
 RESERVATION: ''
 CHGRP_RSTPROD: 'YES'
+CLUSTERS: ''
 CHGRP_CMD: 'chgrp rstprod'
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global

diff --git a/workflow/hosts/s4.yaml b/workflow/hosts/s4.yaml
@@ -16,6 +16,7 @@ PARTITION_BATCH: s4
 PARTITION_SERVICE: serial
 RESERVATION: ''
 CHGRP_RSTPROD: 'NO'
+CLUSTERS: ''
 CHGRP_CMD: 'ls'
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global

diff --git a/workflow/hosts/wcoss2.yaml b/workflow/hosts/wcoss2.yaml
@@ -16,6 +16,7 @@ PARTITION_BATCH: ''
 PARTITION_SERVICE: ''
 RESERVATION: ''
 CHGRP_RSTPROD: 'YES'
+CLUSTERS: ''
 CHGRP_CMD: 'chgrp rstprod'
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global

diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py
@@ -226,7 +226,7 @@ def get_resource(self, task_name):
             native = '--export=NONE'
             if task_config['RESERVATION'] != "":
                 native += '' if task_name in Tasks.SERVICE_TASKS else ' --reservation=' + task_config['RESERVATION']
-            if task_config['CLUSTERS'] not in ["", '@CLUSTERS@']:
+            if task_config.get('CLUSTERS', "") not in ["", '@CLUSTERS@']:
                 native += ' --clusters=' + task_config['CLUSTERS']
 
         queue = task_config['QUEUE_SERVICE'] if task_name in Tasks.SERVICE_TASKS else task_config['QUEUE']