Merge pull request #1646 from cat-bro/fgenesh_to_phm2

fgenesh to phm2
usegalaxy-au · Nov 22, 2023 · 508eaad · 508eaad
2 parents 8cfed5f + 7d1c75d
commit 508eaad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/destinations.yml.j2 b/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/destinations.yml.j2
@@ -153,11 +153,9 @@ destinations:
     # min_accepted_mem: 62.51 # 2/10/23 accept all job sizes
     tags: {{ job_conf_limits.environments['pulsar-high-mem2'].tags }}
     scheduling:
-      accept:
-        - pulsar-high-mem2
       require:
         - pulsar
-        - offline
+        - pulsar-high-mem2
   pulsar-qld-high-mem0:
     inherits: _pulsar_destination
     runner: pulsar-qld-high-mem0_runner

diff --git a/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/tools.yml b/files/galaxy/dynamic_job_rules/production/total_perspective_vortex/tools.yml
@@ -2899,6 +2899,11 @@ tools:
     mem: 12
     params:
       singularity_enabled: true
+    scheduling:
+      accept:
+        - pulsar
+      require:
+        - pulsar-high-mem2
     rules:
     - if: |
         not user or not 'Fgenesh' in [role.name for role in user.all_roles() if not role.deleted]