Skip to content

Commit 1d5aa5e

Browse files
committed
unify tpv configs into one
we run on homogenous infra and should share the settings
1 parent f77ec61 commit 1d5aa5e

File tree

10 files changed

+60
-71
lines changed

10 files changed

+60
-71
lines changed

files/galaxy-qa1.galaxy.cloud.e-infra.cz/tpv_rules_local.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

files/galaxy-qa2.galaxy.cloud.e-infra.cz/tpv_rules_local.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

files/galaxy-umsa.grid.cesnet.cz/tpv_rules_local.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

files/usegalaxy.cz/tpv_rules_local.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

group_vars/galaxyservers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ galaxy_job_config:
8888
tpv_config_files:
8989
- https://raw.githubusercontent.com/galaxyproject/tpv-shared-database/main/tools.yml
9090
- "{{ tpv_config_dir }}/tpv_rules_meta.yml"
91-
- "{{ tpv_config_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
91+
# - "{{ tpv_config_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
9292
resources:
9393
default: default
9494
groups:

host_vars/galaxy-qa1.galaxy.cloud.e-infra.cz/vars.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ pulsar:
1717
galaxy_config_files:
1818
- src: files/galaxy/themes.yml
1919
dest: "{{ galaxy_config.galaxy.themes_config_file }}"
20-
- src: "files/{{ inventory_hostname }}/tpv_rules_local.yml"
21-
dest: "{{ tpv_mutable_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
2220
- src: "{{ lookup('first_found', ['files/'+inventory_hostname+'/config/tool_conf.xml', 'files/galaxy/config/tool_conf.xml']) }}"
2321
dest: "{{ galaxy_config_dir }}/tool_conf.xml"
2422
- src: files/galaxy/config/oidc_config.xml

host_vars/galaxy-qa2.galaxy.cloud.e-infra.cz/vars.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ pulsar:
1616
galaxy_config_files:
1717
- src: files/galaxy/themes.yml
1818
dest: "{{ galaxy_config.galaxy.themes_config_file }}"
19-
- src: "files/{{ inventory_hostname }}/tpv_rules_local.yml"
20-
dest: "{{ tpv_mutable_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
2119
- src: files/{{ inventory_hostname }}/file_sources_conf.yml
2220
dest: "{{ galaxy_config_dir }}/file_sources_conf.yml"
2321
- src: files/{{ inventory_hostname }}/user_preferences_extra_conf.yml

host_vars/galaxy-umsa.grid.cesnet.cz/vars.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ pulsar:
3131
galaxy_config_files:
3232
- src: files/galaxy/themes.yml
3333
dest: "{{ galaxy_config.galaxy.themes_config_file }}"
34-
- src: "files/{{ inventory_hostname }}/tpv_rules_local.yml"
35-
dest: "{{ tpv_mutable_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
3634
- src: "{{ lookup('first_found', ['files/'+inventory_hostname+'/config/tool_conf.xml', 'files/galaxy/config/tool_conf.xml']) }}"
3735
dest: "{{ galaxy_config_dir }}/tool_conf.xml"
3836
- src: files/galaxy/config/oidc_config.xml

host_vars/usegalaxy.cz/vars.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ pulsar:
2626
galaxy_config_files:
2727
- src: files/galaxy/themes.yml
2828
dest: "{{ galaxy_config.galaxy.themes_config_file }}"
29-
- src: "files/{{ inventory_hostname }}/tpv_rules_local.yml"
30-
dest: "{{ tpv_mutable_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
3129
- src: "{{ lookup('first_found', ['files/'+inventory_hostname+'/config/tool_conf.xml', 'files/galaxy/config/tool_conf.xml']) }}"
3230
dest: "{{ galaxy_config_dir }}/tool_conf.xml"
3331
- src: files/galaxy/config/oidc_config.xml

templates/galaxy/config/tpv_rules_meta.yml.j2

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ tools:
1818
- pulsar
1919
reject:
2020
- offline
21+
- docker
2122
rules: []
2223
rank: |
2324
helpers.weighted_random_sampling(candidate_destinations)
@@ -43,15 +44,15 @@ tools:
4344
gpus: 1
4445
context:
4546
walltime: 24
46-
scratch: 25
47+
scratch: 25
4748
gpu_mem: 16
48-
scheduling:
49+
scheduling:
4950
require:
5051
- rosettafold
5152

5253
rosettafold2:
5354
inherits: testing_rosettafold2
54-
scheduling:
55+
scheduling:
5556
require:
5657
- singularity
5758

@@ -109,6 +110,61 @@ tools:
109110
walltime: 96
110111
scratch: 100
111112

113+
.*/abims_xcms_fillPeaks/.*:
114+
context:
115+
walltime: 96
116+
117+
.*/tp_cut_tool/.*:
118+
mem: 1
119+
120+
.*/mfassignr_mfassign.*:
121+
mem: 16
122+
context:
123+
walltime: 48
124+
125+
.*/mfassignr_mfassignCHO/.*:
126+
mem: 32
127+
128+
.*/mfassignr_isofiltr/.*:
129+
mem: 32
130+
131+
.*/recetox_aplcms_align_features/.*:
132+
mem: 150
133+
cores: 8
134+
context:
135+
walltime: 72
136+
137+
.*/recetox_aplcms_compute_clusters/.*:
138+
cores: 1
139+
mem: 16
140+
141+
.*/recetox_aplcms_remove_noise/.*:
142+
cores: 1
143+
mem: 10
144+
145+
.*/recetox_aplcms_generate_feature_table/.*:
146+
mem: 4
147+
148+
.*/ms2deepscore_training/.*:
149+
mem: 16
150+
151+
.*/target_screen/.*:
152+
mem: 16
153+
154+
.*/fastqc/.*:
155+
cores: 1
156+
context:
157+
walltime: 2
158+
159+
.*/qcxms_neutral_run/.*:
160+
mem: 32
161+
162+
.*/qcxms_production_run/.*:
163+
mem: 8
164+
165+
.*/recetox_msfinder/.*:
166+
mem: 16
167+
112168
__SET_.*:
113169
inherits: local_running_tools
114170

0 commit comments

Comments
 (0)