projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11453: Merge branch 'master' into 11453-federated-tokens
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvtool.py
diff --git
a/sdk/cwl/arvados_cwl/arvtool.py
b/sdk/cwl/arvados_cwl/arvtool.py
index 7107ba0a301ff9a80cf03386f78817ec021b2fd9..b667dac1ca5cec6f272c390be8fcd17e1628764c 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvtool.py
+++ b/
sdk/cwl/arvados_cwl/arvtool.py
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
from cwltool.draft2tool import CommandLineTool
from .arvjob import ArvadosJob
from .arvcontainer import ArvadosContainer
from cwltool.draft2tool import CommandLineTool
from .arvjob import ArvadosJob
from .arvcontainer import ArvadosContainer
@@
-11,7
+15,7
@@
class ArvadosCommandTool(CommandLineTool):
self.arvrunner = arvrunner
self.work_api = kwargs["work_api"]
self.arvrunner = arvrunner
self.work_api = kwargs["work_api"]
- def makeJobRunner(self):
+ def makeJobRunner(self
, **kwargs
):
if self.work_api == "containers":
return ArvadosContainer(self.arvrunner)
elif self.work_api == "jobs":
if self.work_api == "containers":
return ArvadosContainer(self.arvrunner)
elif self.work_api == "jobs":
@@
-37,4
+41,6
@@
class ArvadosCommandTool(CommandLineTool):
elif self.work_api == "jobs":
kwargs["outdir"] = "$(task.outdir)"
kwargs["docker_outdir"] = "$(task.outdir)"
elif self.work_api == "jobs":
kwargs["outdir"] = "$(task.outdir)"
kwargs["docker_outdir"] = "$(task.outdir)"
+ kwargs["tmpdir"] = "$(task.tmpdir)"
+ kwargs["docker_tmpdir"] = "$(task.tmpdir)"
return super(ArvadosCommandTool, self).job(joborder, output_callback, **kwargs)
return super(ArvadosCommandTool, self).job(joborder, output_callback, **kwargs)