Merge branch 'slurm_reservation' into dev

Conflicts:
	batchspawner/batchspawner.py
	batchspawner/tests/test_spawners.py

Author: rkdarst

batchspawner/batchspawner.py

@@ -539,6 +539,7 @@ class SlurmSpawner(UserEnvMixin,BatchSpawnerRegexStates):
 {% endif %}{% if runtime    %}#SBATCH --time={{runtime}}
 {% endif %}{% if memory     %}#SBATCH --mem={{memory}}
 {% endif %}{% if nprocs     %}#SBATCH --cpus-per-task={{nprocs}}
+{% endif %}{% if reservation%}#SBATCH --reservation={{reservation}}
 {% endif %}{% if options    %}#SBATCH {{options}}{% endif %}
 
 trap 'echo SIGTERM received' TERM
@@ -563,6 +564,10 @@ class SlurmSpawner(UserEnvMixin,BatchSpawnerRegexStates):
              "to run in job step (affects environment handling)"
         ).tag(config=True)
 
+    req_reservation = Unicode('', \
+        help="Reservation name to submit to resource manager"
+        ).tag(config=True)
+
     # outputs line like "Submitted batch job 209"
     batch_submit_cmd = Unicode('sbatch --parsable').tag(config=True)
     # outputs status and exec node like "RUNNING hostname"

batchspawner/tests/test_spawners.py

@@ -338,12 +338,14 @@ def test_slurm(db, io_loop):
         'req_options': 'some_option_asdf',
         'req_prologue': 'PROLOGUE',
         'req_epilogue': 'EPILOGUE',
+        'req_reservation': 'RES123',
         }
     batch_script_re_list = [
         re.compile(r'PROLOGUE.*srun singleuser_command.*EPILOGUE', re.S),
         re.compile(r'^#SBATCH \s+ --cpus-per-task=5', re.X|re.M),
         re.compile(r'^#SBATCH \s+ --time=3-05:10:10', re.X|re.M),
         re.compile(r'^#SBATCH \s+ some_option_asdf', re.X|re.M),
+        re.compile(r'^#SBATCH \s+ --reservation=RES123', re.X|re.M),
         ]
     from .. import SlurmSpawner
     run_spawner_script(db, io_loop, SlurmSpawner, normal_slurm_script,