Re-enable multicore jobs on Jetstream @ IU plus set memory limits on …

…submissions
galaxyproject · Jun 16, 2018 · f7335f4 · f7335f4
1 parent b701ec9
commit f7335f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/env/common/files/galaxy/dynamic_rules/multi_dynamic_walltime.py b/env/common/files/galaxy/dynamic_rules/multi_dynamic_walltime.py
@@ -62,7 +62,6 @@
 )
 TEAM_DESTINATION = 'reserved_dynamic'
 
-'''
 JETSTREAM_DESTINATION_MAPS = {
     LOCAL_DESTINATION: {
         'clusters': ['jetstream-iu', 'jetstream-tacc', 'roundup'],
@@ -77,8 +76,8 @@
         'partition': 'multi',
     },
 }
-'''
 
+'''
 JETSTREAM_DESTINATION_MAPS = {
     LOCAL_DESTINATION: {
         'clusters': ['jetstream-tacc', 'roundup'],
@@ -93,6 +92,7 @@
         'partition': 'multi',
     },
 }
+'''
 
 '''
 JETSTREAM_DESTINATION_MAPS = {

diff --git a/env/main/templates/galaxy/config/job_conf.xml.j2 b/env/main/templates/galaxy/config/job_conf.xml.j2
@@ -63,9 +63,9 @@
             <!-- this destination exists for the dynamic runner to read the native spec for testing -->
             <param id="nativeSpecification">--time=36:00:00 --nodes=1 --partition=multi</param>
         </destination>
-        <expand macro="jetstream_destination" id="small" site="iu" native_specification="--partition=small --time=36:00:00" />
+        <expand macro="jetstream_destination" id="small" site="iu" native_specification="--partition=small --time=36:00:00 --mem=3584" />
         <expand macro="jetstream_destination" id="normal" site="iu" native_specification="--partition=normal --time=36:00:00 --mem=7168" />
-        <expand macro="jetstream_destination" id="multi" site="iu" native_specification="--partition=multi --time=36:00:00" />
+        <expand macro="jetstream_destination" id="multi" site="iu" native_specification="--partition=multi --time=36:00:00 --mem=28672" />
         <expand macro="jetstream_nagios_destination" site="iu" />
         <expand macro="jetstream_destination" id="multi" site="tacc" native_specification="--partition=multi --nodes=1 --time=36:00:00" />
         <expand macro="jetstream_nagios_destination" site="tacc" />