diff --git a/group_vars/galaxyservers.yml b/group_vars/galaxyservers.yml index 52c62a8..7c9695d 100644 --- a/group_vars/galaxyservers.yml +++ b/group_vars/galaxyservers.yml @@ -172,11 +172,19 @@ galaxy_config: - /cvmfs/data.galaxyproject.org/managed/location/tool_data_table_conf.xml # Tool Dependencies container_resolvers: - - type: explicit_singularity - - cache_directory: /cvmfs/singularity.galaxyproject.org/all/ - type: cached_mulled_singularity - - auto_install: true - type: mulled_singularity + - type: explicit_singularity + - type: cached_mulled_singularity + cache_directory: /cvmfs/singularity.galaxyproject.org/all/ + cache_directory_cacher_type: dir_mtime + # dependency_resolvers: + # - type: conda + # - type: tool_shed_packages + # - type: galaxy_packages + # - type: galaxy_packages + # versionless: true + # - type: conda + # versionless: true + # Data Library Directories library_import_dir: "{{ csnt_library_import_dir }}" user_library_import_dir: "{{ csnt_user_library_import_dir }}" diff --git a/templates/galaxy/config/tpv_rules_meta.yml.j2 b/templates/galaxy/config/tpv_rules_meta.yml.j2 index 7f60a51..c5c3cdb 100644 --- a/templates/galaxy/config/tpv_rules_meta.yml.j2 +++ b/templates/galaxy/config/tpv_rules_meta.yml.j2 @@ -43,15 +43,15 @@ tools: gpus: 1 context: walltime: 24 - scratch: 25 + scratch: 25 gpu_mem: 16 - scheduling: + scheduling: require: - rosettafold rosettafold2: inherits: testing_rosettafold2 - scheduling: + scheduling: require: - singularity