Merge branch '9442-cwl-runtime-outdir' closes #9442

[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 ecc913ecee1e1f6f0227568f8c44e32e09e5d95c..a2dffa675a164e296dc88e966f02de273f2f69c4 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvtool.py
+++ b/sdk/cwl/arvados_cwl/arvtool.py
@@ -28,3 +28,10 @@ class ArvadosCommandTool(CommandLineTool):
                                  "$(task.keep)/%s",
                                  "$(task.keep)/%s/%s",
                                  **kwargs)
+
+    def job(self, joborder, output_callback, **kwargs):
+        if self.work_api == "containers":
+            kwargs["outdir"] = "/var/spool/cwl"
+        elif self.work_api == "jobs":
+            kwargs["outdir"] = "$(task.outdir)"
+        return super(ArvadosCommandTool, self).job(joborder, output_callback, **kwargs)