X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/da3b350bf378bf40f932227b2aad5c232556fac9..caf56e922b9caaa9a65332dc6bf3a36bd8fea48f:/sdk/cwl/arvados_cwl/arvcontainer.py diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py index 78086ed0cc..014e1b94aa 100644 --- a/sdk/cwl/arvados_cwl/arvcontainer.py +++ b/sdk/cwl/arvados_cwl/arvcontainer.py @@ -316,6 +316,7 @@ class RunnerContainer(Runner): "ram": 1024*1024 * self.submit_runner_ram, "API": True }, + "use_existing": self.enable_reuse, "properties": {} } @@ -329,7 +330,7 @@ class RunnerContainer(Runner): "portable_data_hash": "%s" % workflowcollection } else: - packed = packed_workflow(self.arvrunner, self.tool) + packed = packed_workflow(self.arvrunner, self.tool, self.merged_map) workflowpath = "/var/lib/cwl/workflow.json#main" container_req["mounts"]["/var/lib/cwl/workflow.json"] = { "kind": "json", @@ -338,6 +339,7 @@ class RunnerContainer(Runner): if self.tool.tool.get("id", "").startswith("arvwf:"): container_req["properties"]["template_uuid"] = self.tool.tool["id"][6:33] + command = ["arvados-cwl-runner", "--local", "--api=containers", "--no-log-timestamps"] if self.output_name: command.append("--output-name=" + self.output_name)