Skip to content

Commit 4d6570c

Browse files
committed
Use a default env for job destinations, and set JAVA_OPTIONS
1 parent 58a4ec7 commit 4d6570c

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

ansible/files/galaxy/config/tpv_rules_local.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ tools:
7171
toolshed.g2.bx.psu.edu/repos/devteam/fastqc/fastqc/.*:
7272
cores: min(max(int(input_size * 4), 1), 16)
7373
mem: min(max(int(input_size * 7), 5.6), 120)
74-
env:
75-
_JAVA_OPTIONS: -Xmx{int(mem)}G -Xms1G
7674
toolshed.g2.bx.psu.edu/repos/iuc/falco/falco/.*:
7775
cores: 6
7876
mem: 28
@@ -84,8 +82,15 @@ roles:
8482
- training
8583

8684
destinations:
85+
_default_env:
86+
abstract: true
87+
env:
88+
_JAVA_OPTIONS: -Djava.io.tmpdir=$_GALAXY_JOB_TMP_DIR -Xmx{int(mem)}G -Xms256M
89+
SINGULARITYENV__JAVA_OPTIONS: $_JAVA_OPTIONS
90+
8791
slurm-training:
8892
runner: slurm
93+
inherits: _default_env
8994
max_accepted_cores: 32
9095
max_accepted_mem: 240
9196
params:
@@ -102,6 +107,7 @@ destinations:
102107
- training
103108
slurm:
104109
runner: slurm
110+
inherits: _default_env
105111
max_accepted_cores: 32
106112
max_accepted_mem: 1000 # virtually high to catch all, and then downsize to max_mem
107113
# Clamp resources to what the nodes support.

0 commit comments

Comments
 (0)