From fc53ce7d5a7bd7974e8dac163238073e26e8b5d6 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 7 Dec 2018 14:55:55 -0500 Subject: [PATCH] 14476: Fix RunnerTemplate Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/arvados_cwl/arvjob.py | 8 +++++--- sdk/cwl/arvados_cwl/executor.py | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py index c6616c9873..2e4ef55015 100644 --- a/sdk/cwl/arvados_cwl/arvjob.py +++ b/sdk/cwl/arvados_cwl/arvjob.py @@ -386,19 +386,21 @@ class RunnerTemplate(object): } def __init__(self, runner, tool, job_order, enable_reuse, uuid, - submit_runner_ram=0, name=None, merged_map=None): + submit_runner_ram=0, name=None, merged_map=None, + loadingContext=None): self.runner = runner self.embedded_tool = tool self.job = RunnerJob( runner=runner, tool=tool, - job_order=job_order, enable_reuse=enable_reuse, output_name=None, output_tags=None, submit_runner_ram=submit_runner_ram, name=name, - merged_map=merged_map) + merged_map=merged_map, + loadingContext=loadingContext) + self.job.job_order = job_order self.uuid = uuid def pipeline_component_spec(self): diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py index 8eeb951174..195eda6958 100644 --- a/sdk/cwl/arvados_cwl/executor.py +++ b/sdk/cwl/arvados_cwl/executor.py @@ -559,7 +559,8 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods uuid=existing_uuid, submit_runner_ram=runtimeContext.submit_runner_ram, name=runtimeContext.name, - merged_map=merged_map) + merged_map=merged_map, + loadingContext=loadingContext) tmpl.save() # cwltool.main will write our return value to stdout. return (tmpl.uuid, "success") -- 2.39.5