12292: Set defaults for tmpdir, outdir, keep
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 20 Sep 2017 19:24:34 +0000 (15:24 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Sep 2017 14:00:55 +0000 (10:00 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

sdk/cwl/arvados_cwl/arvjob.py

index d104d56e91e7453b5605a0222e17818184a42cb2..18538fb0b4773a8cdb28b3c77c9e4ce3f9be139d 100644 (file)
@@ -222,12 +222,13 @@ class ArvadosJob(object):
                                                                    keep_client=self.arvrunner.keep_client,
                                                                    num_retries=self.arvrunner.num_retries)
                         log = logc.open(logc.keys()[0])
-                        dirs = {}
-                        tmpdir = None
-                        outdir = None
-                        keepdir = None
+                        dirs = {
+                            "tmpdir": "/tmpdir",
+                            "outdir": "/outdir",
+                            "keep": "/keep"
+                        }
                         for l in log:
-                            # Determine the tmpdir, outdir and keepdir paths from
+                            # Determine the tmpdir, outdir and keep paths from
                             # the job run.  Unfortunately, we can't take the first
                             # values we find (which are expected to be near the
                             # top) and stop scanning because if the node fails and