Fix custom attributes generation and some other attributes.

Author: hategan

src/psij/executors/batch/cobalt/cobalt.mustache

@@ -20,14 +20,23 @@
     {{#queue_name}}
 #COBALT --queue={{.}}
     {{/queue_name}}
+    {{!Like PBS, Cobalt uses specially named queues for reservations, so we send the job to the
+    respective queue when a reservation ID is specified.}}
+    {{#reservation_id}}
+#COBALT --queue={{.}}
+    {{/reservation_id}}
     {{#project_name}}
 #COBALT --project={{.}}
     {{/project_name}}
-    {{#custom_attributes.COBALT}}
-#COBALT --{{key}}="{{value}}"
-    {{/custom_attributes.COBALT}}
 {{/job.spec.attributes}}
 
+{{#custom_attributes}}
+    {{#cobalt}}
+#COBALT --{{key}}="{{value}}"
+    {{/cobalt}}
+{{/custom_attributes}}
+
+
 {{#env}}
 #COBALT --env {{name}}={{value}}
 {{/env}}

src/psij/executors/batch/lsf/lsf.mustache

@@ -59,6 +59,13 @@
 
 {{/job.spec.attributes}}
 
+{{#custom_attributes}}
+    {{#lsf}}
+#BSUB -{{key}} "{{value}}"
+    {{/lsf}}
+{{/custom_attributes}}
+
+
 {{!since we redirect the output manually, below, tell LSF not to do its own thing, since it
 only results in empty files that are not cleaned up}}
 #BSUB -e /dev/null

src/psij/executors/batch/pbspro/pbspro.mustache

@@ -16,17 +16,25 @@
 {{/formatted_job_duration}}
 
 {{#job.spec.attributes}}
-    {{#projectName}}
+    {{#project_name}}
 #PBS -P {{.}}
-    {{/projectName}}
-    {{#queueName}}
+    {{/project_name}}
+    {{#queue_name}}
 #PBS -q {{.}}
-    {{/queueName}}
-    {{#custom_attributes.pbs}}
+    {{/queue_name}}
+    {{!PBS uses specially named queues for reservations, so we send the job to the respective
+    queue when a reservation ID is specified.}}
+    {{#reservation_id}}
+#PBS -q {{.}}
+    {{/reservation_id}}
+{{/job.spec.attributes}}
+
+{{#custom_attributes}}
+    {{#pbs}}
 #PBS -{{key}} "{{value}}"
-    {{/custom_attributes.pbs}}
+    {{/pbs}}
+{{/custom_attributes}}
 
-{{/job.spec.attributes}}
 
 {{!since we redirect the output manually, below, tell pbs not to do its own thing, since it
 only results in empty files that are not cleaned up}}

src/psij/executors/batch/slurm/slurm.mustache

@@ -61,12 +61,13 @@
     {{#reservation_id}}
 #SBATCH --reservation="{{.}}"
     {{/reservation_id}}
+{{/job.spec.attributes}}
 
-    {{#custom_attributes.slurm}}
+{{#custom_attributes}}
+    {{#slurm}}
 #SBATCH --{{key}}="{{value}}"
-    {{/custom_attributes.slurm}}
-
-{{/job.spec.attributes}}
+    {{/slurm}}
+{{/custom_attributes}}
 
 {{!since we redirect the output manually, below, tell slurm not to do its own thing, since it
 only results in empty files that are not cleaned up}}

tests/plugins1/_batch_test/test/test.mustache

@@ -13,14 +13,23 @@ export PSIJ_TEST_BATCH_EXEC_COUNT={{.}}
 {{/job.spec.resources}}
 
 {{#job.spec.attributes}}
+    {{#queue_name}}
+export PSIJ_TEST_BATCH_EXEC_QUEUE="{{.}}"
+    {{/queue_name}}
     {{#project_name}}
 export PSIJ_TEST_BATCH_EXEC_PROJECT="{{.}}"
     {{/project_name}}
+    {{#reservation_id}}
+export PSIJ_TEST_BATCH_EXEC_RES_ID="{{.}}"
+    {{/reservation_id}}
+{{/job.spec.attributes}}
 
-    {{#custom_attributes.test}}
+{{#custom_attributes}}
+    {{#batch-test}}
 export {{key}}="{{value}}"
-    {{/custom_attributes.test}}
-{{/job.spec.attributes}}
+    {{/batch-test}}
+{{/custom_attributes}}
+
 
 {{#job.spec.inherit_environment}}env \{{/job.spec.inherit_environment}}{{^job.spec.inherit_environment}}env --ignore-environment \{{/job.spec.inherit_environment}}{{#env}}
 {{name}}="{{value}}" \