opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert chained-resubmission job conf fixture to YAML

Browse Source 
Address PR review feedback (galaxyproject/galaxy#22670): integration
test job configs are sometimes lifted into real server configs, so YAML
is preferred over XML for readability.

Replaces resubmission_dynamic_multiple_job_conf.xml with an equivalent
.yml fixture and updates the test reference. No behavioural change;
the TestJobResubmissionDynamicMultipleIntegration test still passes
(verified locally, 22.7s).
This commit is contained in:
Nuwan Goonasekera
2026-05-19 16:09:11 +05:30
parent 2ffee0a885
commit 8ef17e4097
3 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/resubmission_dynamic_multiple_job_conf.xml
-41
View File
@@ -1,41 +0,0 @@
<?xml version="1.0"?>
<!--
Resubmission through chained dynamic destinations more than once.
Verifies that each resubmit re-walks the dynamic chain so the second
(and subsequent) resubmits land on a fresh destination rather than the
cached bottom of the previous walk.
-->
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="failure_runner" type="runner" load="integration.resubmission_runners:FailsJobRunner" workers="1">
</plugin>
<plugin id="dynamic" type="runner">
<param id="rules_module">integration.resubmission_rules</param>
</plugin>
</plugins>
<destinations default="initial_destination">
<destination id="initial_destination" runner="dynamic">
<param id="type">python</param>
<param id="function">dynamic_resubmit_initial</param>
</destination>
<destination id="secondary_destination" runner="dynamic">
<param id="type">python</param>
<param id="function">dynamic_resubmit_secondary</param>
</destination>
<destination id="tertiary_destination" runner="dynamic">
<param id="type">python</param>
<param id="function">dynamic_resubmit_tertiary</param>
</destination>
<!-- Upload destination. -->
<destination id="local" runner="local">
</destination>
</destinations>
<tools>
<tool class="local" destination="local" />
</tools>
</job_conf>
test/integration/resubmission_dynamic_multiple_job_conf.yml
+38
View File
@@ -0,0 +1,38 @@
# Resubmission through chained dynamic destinations more than once.
# Verifies that each resubmit re-walks the dynamic chain so the second
# (and subsequent) resubmits land on a fresh destination rather than the
# cached bottom of the previous walk.
runners:
local:
load: galaxy.jobs.runners.local:LocalJobRunner
workers: 1
failure_runner:
load: integration.resubmission_runners:FailsJobRunner
workers: 1
dynamic:
rules_module: integration.resubmission_rules
execution:
default: initial_destination
environments:
initial_destination:
runner: dynamic
type: python
function: dynamic_resubmit_initial
secondary_destination:
runner: dynamic
type: python
function: dynamic_resubmit_secondary
tertiary_destination:
runner: dynamic
type: python
function: dynamic_resubmit_tertiary
local:
runner: local
tools:
- class: local
environment: local
test/integration/test_job_resubmission.py
+1 -1
View File
@@ -10,7 +10,7 @@ JOB_RESUBMISSION_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "resubmission_
JOB_RESUBMISSION_DEFAULT_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "resubmission_default_job_conf.xml")
JOB_RESUBMISSION_DYNAMIC_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "resubmission_dynamic_job_conf.xml")
JOB_RESUBMISSION_DYNAMIC_MULTIPLE_JOB_CONFIG_FILE = os.path.join(
SCRIPT_DIRECTORY, "resubmission_dynamic_multiple_job_conf.xml"
SCRIPT_DIRECTORY, "resubmission_dynamic_multiple_job_conf.yml"
)
JOB_RESUBMISSION_SMALL_MEMORY_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "resubmission_small_memory_job_conf.xml")
JOB_RESUBMISSION_SMALL_MEMORY_RESUBMISSION_TO_LARGE_JOB_CONFIG_FILE = os.path.join(