Run more tools from Test on Stampede

galaxyproject · Apr 9, 2015 · b0b9a6d · b0b9a6d
1 parent c8fa515
commit b0b9a6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/files/galaxy/test.galaxyproject.org/dynamic_rules/multi_dynamic_walltime.py b/files/galaxy/test.galaxyproject.org/dynamic_rules/multi_dynamic_walltime.py
@@ -36,16 +36,21 @@
     'bowtie_wrapper': {'runtime': 19.75, 'stddev': 65.27},
     #'bwa_wrapper': {'runtime': 51.47, 'stddev': 157.78},
     # TESTING
-    'bwa_wrapper': {'runtime': 5.00, 'stddev': 1.00},
+    'bwa_wrapper': {'runtime': 1.00, 'stddev': 1.00},
     # FIXME: bwa and bwa_mem copied from bwa_wrapper, surely invalid
     'bwa': {'runtime': 51.47, 'stddev': 157.78},
     'bwa_mem': {'runtime': 51.47, 'stddev': 157.78},
     'bowtie2': {'runtime': 28.23, 'stddev': 45.48},
-    'cuffdiff': {'runtime': 108.27, 'stddev': 258.30},
     'tophat': {'runtime': 152.69, 'stddev': 295.26},
     'tophat2': {'runtime': 165.47, 'stddev': 286.19},
     'cufflinks': {'runtime': 44.73, 'stddev': 157.20},
-    'cuffmerge': {'runtime': 35.07, 'stddev': 181.65}
+    'cuffdiff': {'runtime': 108.27, 'stddev': 258.30},
+    'cuffmerge': {'runtime': 35.07, 'stddev': 181.65},
+    # FIXME: cuffnorm and cuffquant copied from cufflinks
+    'cuffnorm': {'runtime': 44.73, 'stddev': 157.20},
+    'cuffquant': {'runtime': 44.73, 'stddev': 157.20},
+    # FIXME: stringtie copied from tophat2
+    'stringtie': {'runtime': 165.47, 'stddev': 286.19},
 }
 DEVS = 0
 

diff --git a/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2 b/templates/galaxy/test.galaxyproject.org/config/job_conf.xml.j2
@@ -230,9 +230,6 @@
     </destinations>
     <tools>
         <!-- explicit roundup jobs -->
-        <tool id="stringtie" destination="slurm_normal_multi" handler="test_handler2" />
-        <tool id="cuffnorm" destination="slurm_normal_multi" handler="test_handler2" />
-        <tool id="cuffquant" destination="slurm_normal_multi" handler="test_handler2" />
         <tool id="gemini_load" destination="slurm_normal_multi" handler="test_handler2" />
         <tool id="deeptools_bamCompare" destination="slurm_normal_multi" handler="test_handler2" />
         <tool id="deeptools_bamCorrelate" destination="slurm_normal_multi" handler="test_handler2" />
@@ -257,6 +254,9 @@
         <tool id="cuffdiff" destination="dynamic_multi_dynamic_walltime" handler="test_handler2" resources="local_or_stampede"/>
         <tool id="cufflinks" destination="dynamic_multi_dynamic_walltime" handler="test_handler2" resources="local_or_stampede"/>
         <tool id="cuffmerge" destination="dynamic_multi_dynamic_walltime" handler="test_handler2" resources="local_or_stampede"/>
+        <tool id="cuffnorm" destination="dynamic_multi_dynamic_walltime" handler="test_handler2"  resources="local_or_stampede"/>
+        <tool id="cuffquant" destination="dynamic_multi_dynamic_walltime" handler="test_handler2" resources="local_or_stampede"/>
+        <tool id="stringtie" destination="dynamic_multi_dynamic_walltime" handler="test_handler2"  resources="local_or_stampede"/>
         <!-- blacklight jobs -->
         <tool id="trinity_blacklight" destination="dynamic_blacklight_select" handler="test_handler3" resources="blacklight"/>
         <tool id="spades" destination="dynamic_blacklight_select" handler="test_handler3" resources="blacklight"/>