Merge pull request #2192 from cat-bro/try_verkko_without_singularity

try verkko without singularity
usegalaxy-au · Sep 20, 2024 · 95c6b39 · 95c6b39
2 parents 705534c + 0b45a36
commit 95c6b39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/tools.yml b/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/tools.yml
@@ -3153,8 +3153,8 @@ tools:
   toolshed.g2.bx.psu.edu/repos/iuc/verkko/verkko/.*:
     cores: 16
     mem: 62
-    params:
-      singularity_enabled: true
+    # params:
+    #   singularity_enabled: true
   toolshed.g2.bx.psu.edu/repos/iuc/vsearch/.*:
     mem: 8
     params:

diff --git a/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/users.yml b/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/users.yml
@@ -93,18 +93,6 @@ users:
             singularity_enabled: True
             docker_enabled: False
             dependency_resolution: none
-        - id: conda_test_user_rule
-          if: |
-            use_conda_env = False
-            if tool.id.startswith('toolshed') or tool.id.startswith('testtoolshed'):
-              try:
-                use_conda_env = 'conda' in [hta.user_tname for hta in job.history.tags]
-              except:
-                pass
-            use_conda_env
-          params:
-            singularity_enabled: False
-            docker_enabled: False
     [email protected]:
       inherits: test_user
       cores: test_cores