From 0b45a363b59426fb7cdb9ac5747222f574600a4c Mon Sep 17 00:00:00 2001 From: cat-bro Date: Fri, 20 Sep 2024 11:02:36 +1000 Subject: [PATCH] try verkko without singularity --- .../production/total_perspective_vortex/tools.yml | 4 ++-- .../production/total_perspective_vortex/users.yml | 12 ------------ 2 files changed, 2 insertions(+), 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 index 264477c50..759949b89 100644 --- 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 index 8f4ca5e62..81bbb83fd 100644 --- 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 jenkins_bot@usegalaxy.org.au: inherits: test_user cores: test_cores