add new tesp runner, configure tpv to send jobs for specific role there

galaxy.yml

@@ -198,9 +198,6 @@
     - usegalaxy_eu.apptainer
     - galaxyproject.galaxy
     - usegalaxy_eu.tpv_auto_lint
-    - role: galaxyproject.miniconda
-      become: true
-      become_user: "{{ galaxy_user_name }}"
     - geerlingguy.redis
     - role: usegalaxy_eu.flower
       when: enable_flower | bool

group_vars/galaxyservers.yml

@@ -50,11 +50,6 @@ galaxy_commit_id: release_24.2
 galaxy_force_checkout: true
 galaxy_job_config_file: "{{ galaxy_config_dir }}/galaxy.yml"
 
-# Miniconda
-miniconda_prefix: "{{ galaxy_tool_dependency_dir }}/_conda"
-miniconda_version: 24.11.1
-miniconda_channels: ['conda-forge', 'defaults']
-
 # Pulsar
 pulsar_data_dir: "/storage/{{ pulsar.nfs_home }}/home/{{ pulsar.user_name }}/{{ pulsar.nfs_prefix }}"
 
@@ -74,6 +69,10 @@ galaxy_job_config:
       amqp_publish_retry: true
       amqp_publish_retry_max_retries: 60
       manager: _default_
+    pulsar_tes_runner:
+      load: galaxy.jobs.runners.pulsar:PulsarTesJobRunner
+      amqp_url: "pyamqp://{{ pulsar.user_name }}:{{ rabbitmq_users_password.pulsar }}@{{ rabbitmq_hostname }}:5671/pulsar?ssl=1"
+      workers: 4
   handling:
     assign: ['db-skip-locked']
   execution:
@@ -257,6 +256,8 @@ galaxy_config_templates:
     dest: "{{ galaxy_config_dir }}/local_tool_conf.xml"
   - src: templates/galaxy/config/tpv_rules_meta.yml.j2
     dest: "{{ tpv_mutable_dir }}/tpv_rules_meta.yml"
+  - src: templates/{{ inventory_hostname }}/config/tpv_rules_local.yml.j2
+    dest: "{{ tpv_mutable_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
   - src: "templates/galaxy/config/vault_conf.yml.j2"
     dest: "{{ galaxy_config_dir }}/vault_conf.yml"
   - src: "{{ lookup('first_found', ['templates/'+inventory_hostname+'/config/file_source_templates.yml.j2', 'templates/galaxy/config/file_source_templates.yml.j2']) }}"

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

@@ -1,5 +1,5 @@
 galaxy_build_client: false
-galaxy_commit_id: release_24.2
+galaxy_commit_id: release_25.0
 
 csnt_brand: QA2-TEST
 # csnt_enable_account_interface: false
@@ -17,8 +17,6 @@ pulsar:
 galaxy_config_files:
   - src: files/galaxy/themes.yml
     dest: "{{ galaxy_config.galaxy.themes_config_file }}"
-  - src: "files/{{ inventory_hostname }}/tpv_rules_local.yml"
-    dest: "{{ tpv_mutable_dir }}/tpv_rules_{{ inventory_hostname }}.yml"
   - src: files/{{ inventory_hostname }}/file_sources_conf.yml
     dest: "{{ galaxy_config_dir }}/file_sources_conf.yml"
   - src: files/{{ inventory_hostname }}/user_preferences_extra_conf.yml

requirements.yml

@@ -6,8 +6,6 @@
   version: 1.1.7
 - src: galaxyproject.postgresql_objects
   version: 1.2.0
-- src: galaxyproject.miniconda
-  version: 0.3.1
 - src: usegalaxy_eu.certbot
   version: 0.1.11
 - src: galaxyproject.tusd

templates/galaxy-qa2.galaxy.cloud.e-infra.cz/config/tpv_rules_local.yml.j2

@@ -0,0 +1,45 @@
+global:
+  default_inherits: default
+roles:
+  tesp_tester:
+    scheduling:
+      require:
+        - tes
+destinations:
+  tesp_testing:
+    runner: pulsar_tes_runner
+    max_accepted_cores: 128
+    max_accepted_mem: 512
+    max_accepted_gpus: 0
+    max_cores: 16
+    max_mem: 180
+    max_gpus: 0
+    params:
+      tes_url: "http://147.251.245.185:8080"
+      pulsar_app_config:
+        message_queue_url: "pyamqp://{{ pulsar.user_name }}:{{ rabbitmq_users_password.pulsar }}@{{ rabbitmq_hostname }}:5671/pulsar?ssl=1"
+      dependency_resolution: remote
+      jobs_directory: "{{ pulsar_data_dir }}/files/staging"
+      persistence_directory: "/opt/pulsar/files/persistent"
+      remote_metadata: false
+      rewrite_parameters: true
+      outputs_to_working_directory: false
+      submit_native_specification: "-l select=1:ncpus={int(cores)}:mem={int(mem)}gb:scratch_local={int(scratch)}gb -l walltime={int(walltime)}:00:00 -q {{ pulsar.pbs_queue }} -N {{ pulsar.nfs_prefix }}_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'}"
+      singularity_enabled: true
+      singularity_volumes: "$job_directory:rw,$tool_directory:ro,$job_directory/outputs:rw,$working_directory:rw,/cvmfs/data.galaxyproject.org:ro,$SCRATCHDIR:rw"
+      singularity_default_container_id: "/cvmfs/singularity.galaxyproject.org/all/python:3.8.3"
+      singularity_run_extra_arguments: >-
+        --env JAVA_OPTS="-Xmx{int(mem)}g -Djava.io.tmpdir=$SCRATCHDIR"
+        --env JAVA_TOOL_OPTIONS="-Xmx{int(mem)}g -Djava.io.tmpdir=$SCRATCHDIR"
+    env:
+      LC_ALL: C
+      TMPDIR: $SCRATCHDIR
+      TMP: $SCRATCHDIR
+      TEMP: $SCRATCHDIR
+      SINGULARITY_CACHEDIR: "/cvmfs/singularity.galaxyproject.org/all/"
+      SINGULARITY_TMPDIR: $SCRATCHDIR
+      XDG_CACHE_HOME: $SCRATCHDIR
+    scheduling:
+      require:
+        - tes
+        - pulsar