Skip to content

Commit

Permalink
Merge branch 'master' into release_24.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bgruening authored Jun 4, 2024
2 parents 0648121 + 283b662 commit da7ed17
Show file tree
Hide file tree
Showing 45 changed files with 752 additions and 891 deletions.
8 changes: 8 additions & 0 deletions celery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@
alternatives:
name: python
path: /usr/bin/python3
- name: Increase fs.inotify.max_user_watches # see https://github.com/usegalaxy-eu/issues/issues/544
ansible.posix.sysctl:
name: fs.inotify.max_user_watches
value: '524288'
sysctl_set: true
state: present
reload: true
roles:
- artis3n.tailscale
- role: usegalaxy_eu.handy.os_setup
vars:
enable_remap_user: true
Expand Down
105 changes: 52 additions & 53 deletions files/clouds.yaml
Original file line number Diff line number Diff line change
@@ -1,54 +1,53 @@
$ANSIBLE_VAULT;1.1;AES256

Check warning on line 1 in files/clouds.yaml

View workflow job for this annotation

GitHub Actions / Lint

1:1 [document-start] missing document start "---"
35653765643938363737613233643036373566633739313036346366393862363733346630653732
6131353838333839646330336663353136323766396537300a373033626639393332663939653165
33376130313031333232383364313033656333613638663836623930326537613531663138306536
3361373732333363640a613634633032303437336463316238633030343333393136383334336138
38373337646330326165396336666530653737333538353239313034333830353730366663383163
31633736623166633633396439376336353662643066623839333331343935383332663636646661
35633862303762343863666665663564393530623830376338613231616636316637386539653036
30383136316533363734323334366231623133616162376662326532663538313366373265643536
65333961376237643032346565633834353334343030336463663332663766346262616362373437
63303035386163643337653538356263376464366566633566363333386639633465386139303938
31363135366235323336653834636233653265626266373039396339356533363964656565366231
34323033363562333461333765353161656134363537343639366666653635666262633636313339
63353561643338623365343761623738343961306133316134353165386562323463306139363135
30343936633133613331636664636332643136643637323630326233626464313738643532313039
36613664303961336436316533613236653635666332663330663963393331653237356534643438
35323436396138633133366135616636373832303339313938303533373264396565633931316633
64306463396364353634616466313537623832623435343166346165313233316639363666316236
34353762653162343262623836353032306464376538343030643865626435313830306162386239
66623930653931336238346533323634626265626434626336623264343734333636343330343961
36333362346565623830393361643936646563626565366636383935303138333434343861326263
31353032613034323138623162343737353837666338376664323564666136303939666530363637
35653165633961613863356164373034643566386635623364613438383161653136373634626362
34336266636531366636323363386530653066366364316462633535643765643731396364363438
34383734393164623266323464663738636330356236613964636432656335333933616466353439
64613136343932643038323765623164663061323933626664376139666235636635316139643165
31613662616463666461363866613339386436376137306439653566616337393232313231663231
35663266656435653033646136373032383566393130393637646465363164663761383062353165
66636435633138343738386235636332306236386334343333363662313230303236653032303061
64643531633735643463316138653930363833363936373561396562643238663335656265353633
30623665336266663237646233646430613339653466333064343065613635383538646362336261
32393734666539616531623835353438313432306536616565333264323830383861333932636661
62633231353235623833356234613836653361383466303866633638336538373161333261366332
34313731343638643366373331613238613632383666306433343231313935643262346331633133
62613738363563363338316661316137353066386365306138613938366162353265386336333331
64353533613861366239623463373035373837643265636631663832663537373435333561303630
35383064336561396338303134373334343638316134343439343866613864333766306265393936
61666361373534323762643337616539346462366432333136613935393934616237336562656366
34663866633732356663306666336265636436356632313961313131326235346130316138373963
35653035383634343363623634343536373331636333623635616536616635346135343539613363
31623438643865393731306138396235666538376364633163313732663663323438636664653363
64366565393234383633346634613561663964396261626664316562333134306135303332653266
62626432313637353162313833346531636331303763613130313332396562326163386238663135
65363139316538336335386534346133356335623162643963643461343465616665643762646564
38383363613965623939326266313462353736323764636434656631396261306165623834626333
34383635313062323366356631613761336637373064623963303230336536346332396638626465
64363263636632373136386434393730393961303039306139386530623564386630313134393137
61376366393661636365653434633539346635336437626266646339303130343665356466343865
61303136653431663565353064643530666363356437393433653863383235343332326465373531
37376265383463393738376161316666346263333730643935343664356536383333656164663937
39336464306264656662373761303031646464336366313562323564373334623934646132643563
30346138343961663435336363613464393765316231616130393930646430353935353764633863
30356339376365623637616463323838303164393534343464336334626533386339373165356532
63333865363636396437393935633739316266313532636663303533386138396332
64623365373236356362333430383963653639303939613731356266376463616339623131316539
3739363930323234373931653335616130623533393931610a383436613430343862656366663966
39366663373938333930396533353934386261393430656437633637663931306638633535303437
3733356534333536660a353733393236636264303536363535303265313266343430626662333666
64313137343436366437623236666531373066363763656262313363613233303565373566643131
38343632643835626331376666633939343734303732386136643865633863333230326563616539
34653337326662336465323830653961336562633562356365656364656264646362396465613863
62373933616266356363656563323031393630383963653065386566343335336531316533653930
61663366626631613063346565643036643832356161663664306131313539653132346165653761
63616462393938643664393865346261333166303962616639363830323562663639346538663139
61303538383761633033346537356666656430316266666563343237356533376632613630323734
64666233396662333438353464333537663238363164333662323262613561623663386138656330
36386339373166323863333236636132613263383063313538323937356463373464333930626433
36356466633734386334323736336136323064336266623763653339653931343030343262366632
35663335306130376663306162366161623638656466316561326339346230326262336133306131
33326132656364663666346536333532343463363234323335363333663132313130663764386237
31613232343034613766346536383538393733626233656230353933643832363736646539333937
66616335653735346364633135363562303264373161616632663834386338313135346432343565
36633139363563366134643766363065353437343032316563393534613633346137633565643464
32623961663535653163316164613532373531613337383436333364376132363135663864613164
34313138663032396430643162303163626330613765393765663539643265653935313433626539
61343063313165663964366365343439313034356662326230366365376634663334306261393562
30343965653330336330383265303630396436613339326634623134363865653132343962363432
61666337323635616364653566383332323265633861343132366162373630353838323736666463
62313465373466663066353338623930326564353361393632656265383139616439616436393261
65376431633535313834396635323961633732653831323965663039333439633233306233656632
66303230306638303338346635333566653664303463656639336264646439613864313739646364
35323039356262623863656266346239313039353439386336336134633430663132353261663738
37666264383733656232303536336666643735656461303863303164356432626134363164383439
36626463353064636334376535313138373466373437643462356438313839663537386134336366
30323162643934343835633835303939613735326539393766636638376665316434613338663564
36333030653865373539383762303531643766356162643134663639336330626166343765303964
35363736633735343333386631383830643736366532623533353733623630366239343963366339
65303130633330316562343635323462636566333536303136393135393031623965316161376236
38663166633135653535353461363030633362343635623737303932653836393262613564393139
32383061326266333938643634346530656635363461336130623262343237623364613430313266
37343434323839383432616232373133313532613765356262616639393365663134363539316662
37303037656334656230623361626536353162643739353039373965333332653638326466316338
37333065666362396461653165353436656631376330643333393462346564343565313331303163
30623933393531613737666630616435653966383966616362656162636230343331303764343632
31353534653930343433323238663766343238396166646661386166333031333365383733333861
63303432393737646633346333623232633935666137373633626639306239336630393163303033
32333066346161643166393762373666326163373537393733643839306433366438643064313135
36633463373361643263336164383162323934656633303637626335356138303266636131613766
37326437636262396432653837366462643835616233646139613235313632363962326262626132
66336633663636643163323064386533386261393232323564636533613531323363306165373762
37393233313434663965356461353465333362626537363233666233323661663633643431366432
61306139336164376635626231333931306163343863636337353961336231666233663534333065
33346331626631363732366134643966336233643934613462303731623164346235333266663263
39386235376261313630356634333066323932623465626434373635363363663563383864366263
66643061623734333962663861313831613135653531613339643038333337643831336366303235
66333166346436333936
4 changes: 4 additions & 0 deletions files/galaxy/config/tool_data_table_conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<tables>
<!-- TODO(hxr): test if we can remove path since specified in galaxy.yml -->
<!-- Locations of all fasta files under genome directory -->
<table comment_char="#" name="__dbkeys__">
<columns>value, name, len_path</columns>
<file path="/opt/galaxy/tool-data/dbkeys.loc"/>
</table>
<table name="all_fasta" comment_char="#" allow_duplicate_entries="False">
<columns>value, dbkey, name, path</columns>
<file path="/opt/galaxy/tool-data/all_fasta.loc" />
Expand Down
21 changes: 17 additions & 4 deletions files/galaxy/config/user_preferences_extra_conf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,26 @@ preferences:
# store: vault
required: False

invenio:
description: Your Invenio RDM Integration Settings
zenodo:
description: Your Zenodo Integration Settings
inputs:
- name: token
label: Personal Token used to create draft records and to upload files
label: Personal Access Token used to create draft records and to upload files. You can manage your tokens at https://zenodo.org/account/settings/applications/
type: secret
# store: vault # Requires setting up vault_config_file in your galaxy.yml
store: vault # Requires setting up vault_config_file in your galaxy.yml
required: False
- name: public_name
label: Creator name to associate with new records (formatted as "Last name, First name"). If left blank "Anonymous Galaxy User" will be used. You can always change this by editing your record directly.
type: text
required: False

zenodo_sandbox:
description: Your Zenodo Sandbox Integration Settings (TESTING ONLY)
inputs:
- name: token
label: Personal Access Token used to create draft records and to upload files. You can manage your tokens at https://sandbox.zenodo.org/account/settings/applications/
type: secret
store: vault # Requires setting up vault_config_file in your galaxy.yml
required: False
- name: public_name
label: Creator name to associate with new records (formatted as "Last name, First name"). If left blank "Anonymous Galaxy User" will be used. You can always change this by editing your record directly.
Expand Down
26 changes: 18 additions & 8 deletions files/galaxy/tpv/destinations.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ destinations:
outputs_to_working_directory: "false"
dependency_resolution: "none"
submit_request_cpus: "{cores}"
submit_request_memory: "{mem}"
submit_request_memory: "{mem}G"
docker_volumes: "$job_directory:rw,
$tool_directory:ro,
$job_directory/outputs:rw,
Expand Down Expand Up @@ -183,7 +183,7 @@ destinations:
inherits: pulsar_default
runner: pulsar_eu_sk01
max_accepted_cores: 8
max_accepted_mem: 16
max_accepted_mem: 31
min_accepted_gpus: 0
max_accepted_gpus: 0
scheduling:
Expand Down Expand Up @@ -244,46 +244,52 @@ destinations:
inherits: pulsar_default
runner: pulsar_eu_cz01
max_accepted_cores: 32
max_accepted_mem: 128
max_accepted_mem: 256
min_accepted_gpus: 0
max_accepted_gpus: 0
env:
LC_ALL: C
SINGULARITY_CACHEDIR: "/storage/praha5-elixir/home/galaxyeu/singularity"
SINGULARITY_TMPDIR: "/storage/praha5-elixir/home/galaxyeu/singularity/tmp"
#SINGULARITY_CACHEDIR: "/storage/praha5-elixir/home/galaxyeu/singularity"
SINGULARITY_CACHEDIR: "/cvmfs/singularity.galaxyproject.org/all/"
SINGULARITY_TMPDIR: "$SCRATCHDIR"
TMPDIR: "$SCRATCHDIR"
TMP: "$SCRATCHDIR"
TEMP: "$SCRATCHDIR"
XDG_CACHE_HOME: "$SCRATCHDIR"
params:
jobs_directory: "/storage/praha5-elixir/home/galaxyeu/pulsar-eu/files/staging"
persistence_directory: "/opt/pulsar/files/persistent"
singularity_volumes: "$job_directory:rw,$tool_directory:ro,$job_directory/outputs:rw,$working_directory:rw,/cvmfs/data.galaxyproject.org:ro,$SCRATCHDIR,/storage/praha5-elixir/home/galaxyeu:/home/galaxyeu,/cvmfs/data.galaxyproject.org/managed/:/data/db/data_managers/:ro"
singularity_run_extra_arguments: --env "_JAVA_OPTIONS=\"-Djava.io.tmpdir=$SCRATCHDIR\""
submit_native_specification: "-l select=1:ncpus={int(cores)}:mem={int(mem)}gb:scratch_local=100gb -l walltime=24:00:00 -q [email protected] -N pulsar_eu_j{job.id}__{tool.id if '/' not in tool.id else tool.id.split('/')[-2]+'_v'+tool.id.split('/')[-1]}__{user.username if user and hasattr(user, 'username') else 'anonymous'}"
scheduling:
require:
- cz-pulsar

pulsar_cz02_tpv:
inherits: pulsar_default
runner: pulsar_eu_cz02
runner: pulsar_eu_cz01
max_accepted_cores: 32
max_accepted_mem: 128
min_accepted_gpus: 1
max_accepted_gpus: 1
env:
LC_ALL: C
SINGULARITY_CACHEDIR: "/storage/praha5-elixir/home/galaxyeu/singularity"
SINGULARITY_TMPDIR: "/storage/praha5-elixir/home/galaxyeu/singularity/tmp"
#SINGULARITY_CACHEDIR: "/storage/praha5-elixir/home/galaxyeu/singularity"
SINGULARITY_CACHEDIR: "/cvmfs/singularity.galaxyproject.org/all/"
SINGULARITY_TMPDIR: "$SCRATCHDIR"
TMPDIR: "$SCRATCHDIR"
TMP: "$SCRATCHDIR"
TEMP: "$SCRATCHDIR"
XDG_CACHE_HOME: "$SCRATCHDIR"
ALPHAFOLD_DB: "/storage/brno11-elixir/projects/alphafold/alphafold.db-2.3.1"
GPU_AVAILABLE: "1"
params:
jobs_directory: "/storage/praha5-elixir/home/galaxyeu/pulsar-eu/files/staging"
persistence_directory: "/opt/pulsar/files/persistent"
singularity_volumes: "$job_directory:rw,$tool_directory:ro,$job_directory/outputs:rw,$working_directory:rw,/cvmfs/data.galaxyproject.org:ro,$SCRATCHDIR,/storage/praha5-elixir/home/galaxyeu:/home/galaxyeu,$ALPHAFOLD_DB:/data:ro"
singularity_run_extra_arguments: "--nv --env ALPHAFOLD_USE_GPU=True"
submit_native_specification: "-l select=1:ncpus=1:mem={int(mem)}gb:scratch_local=100gb:ngpus=1:gpu_mem=8gb -l walltime=24:00:00 -q [email protected] -N pulsar_eu_j{job.id}__{tool.id if '/' not in tool.id else tool.id.split('/')[-2]+'_v'+tool.id.split('/')[-1]}__{user.username if user and hasattr(user, 'username') else 'anonymous'}"
scheduling:
require:
- cz-pulsar
Expand Down Expand Up @@ -347,6 +353,10 @@ destinations:
max_accepted_mem: 30
min_accepted_gpus: 0
max_accepted_gpus: 0
env:
TMP: $_GALAXY_JOB_TMP_DIR
TEMP: $_GALAXY_JOB_TMP_DIR
TMPDIR: $_GALAXY_JOB_TMP_DIR
scheduling:
require:
- hcmr-gr-pulsar
Expand Down
Loading

0 comments on commit da7ed17

Please sign in to comment.