Skip to content

add support to tags #2230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gsaudade99 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

add support to tags #2230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion templates/galaxy/config/job_conf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,26 @@ galaxy_jobconf:
plugin_workers: 8
handlers:
count: "{{ galaxy_systemd_handlers }}"
assign_with: db-skip-locked
assign: db-skip-locked
max_grab: 16
ready_window_size: 32
handler_definitions:
0:
tags:
- htcondor-apiv2
plugins:
- htcondor_apiv2
default_process:
exclude_plugins:
- htcondor_apiv2
plugins:
#- id: drmaa
#load: galaxy.jobs.runners.drmaa:DRMAAJobRunner
#workers: 3
- id: condor
load: galaxy.jobs.runners.condor:CondorJobRunner
- id: htcondor_apiv2
load: galaxy.jobs.runners.htcondor:HTCondorJobRunner
- id: local
load: galaxy.jobs.runners.local:LocalJobRunner
- id: pulsar_embedded
Expand Down
29 changes: 26 additions & 3 deletions templates/galaxy/config/job_conf.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ runners:
# Job handler configuration
#
handling:
{% if galaxy_jobconf.handlers.assign_with is defined %}
assign_with:
- {{ galaxy_jobconf.handlers.assign_with }}
{% if galaxy_jobconf.handlers.assign is defined %}
assign:
- {{ galaxy_jobconf.handlers.assign }}
{% endif %}
{% if galaxy_jobconf.handlers.default is defined %}
default: {{ galaxy_jobconf.handlers.default }}
Expand All @@ -46,8 +46,28 @@ handling:
{% endif %}
{% if galaxy_systemd_handlers is defined and galaxy_systemd_handlers > 0 %}
processes:
{% set handler_definitions = galaxy_jobconf.handlers.handler_definitions | default({}) %}
{% set default_handler_definition = galaxy_jobconf.handlers.default_process | default({}) %}
{% for n in range(galaxy_systemd_handlers) %}
{% set handler_definition = handler_definitions.get(n, default_handler_definition) %}
{{ galaxy_systemd_handler_prefix }}_{{ n }}:
{% if handler_definition.tags is defined %}
tags:
{% for tag in handler_definition.tags %}
- {{ tag }}
{% endfor %}
{% endif %}
{% if handler_definition.plugins is defined %}
plugins:
{% for plugin in handler_definition.plugins %}
- {{ plugin }}
{% endfor %}
{% elif handler_definition.exclude_plugins is defined %}
plugins:
{% for plugin in galaxy_jobconf.plugins | sort(attribute='id') if plugin.id not in handler_definition.exclude_plugins %}
- {{ plugin.id }}
{% endfor %}
{% endif %}
{% endfor %}
{% elif galaxy_systemd_handlers is defined and galaxy_systemd_handlers == 0 %}
processes:
Expand Down Expand Up @@ -114,6 +134,9 @@ tools:
{% if 'destination' in tool %}
environment: {{ tool['destination'] }}
{% endif %}
{% if 'handler' in tool %}
handler: {{ tool['handler'] }}
{% endif %}
{% if 'resources' in tool %}
resources: {{ tool['resources'] }}
{% endif %}
Expand Down
Loading