Add random outdir support

Author: pvanheus

cwltool/command_line_tool.py

@@ -42,7 +42,7 @@
 from .stdfsaccess import StdFsAccess  # pylint: disable=unused-import
 from .utils import (aslist, convert_pathsep_to_unix,
                     docker_windows_path_adjust, json_dumps, onWindows,
-                    windows_default_container_id)
+                    windows_default_container_id, random_outdir)
 from .context import (LoadingContext,  # pylint: disable=unused-import
                       RuntimeContext, getdefault)
 if TYPE_CHECKING:
@@ -354,7 +354,7 @@ def job(self,
 
             if os.path.isdir(jobcache) and not os.path.isfile(jobcachepending):
                 if docker_req and runtimeContext.use_container:
-                    cachebuilder.outdir = runtimeContext.docker_outdir or "/var/spool/cwl"
+                    cachebuilder.outdir = runtimeContext.docker_outdir or random_outdir()
                 else:
                     cachebuilder.outdir = jobcache
 

cwltool/process.py

@@ -44,7 +44,7 @@
     DependenciesConfiguration)
 from .stdfsaccess import StdFsAccess
 from .utils import (DEFAULT_TMP_PREFIX, aslist, cmp_like_py2,
-                    copytree_with_merge, onWindows)
+                    copytree_with_merge, onWindows, random_outdir)
 from .validate_js import validate_js_expressions
 from .context import (LoadingContext,  # pylint: disable=unused-import
                       RuntimeContext, getdefault)
@@ -629,9 +629,9 @@ def _init_job(self, joborder, runtimeContext):
                     outdir = dockerReq.get("dockerOutputDirectory")
                 else:
                     outdir = dockerReq.get("dockerOutputDirectory") or \
-                        runtimeContext.docker_outdir or "/var/spool/cwl"
+                        runtimeContext.docker_outdir or random_outdir()
             elif defaultDocker:
-                outdir = runtimeContext.docker_outdir or "/var/spool/cwl"
+                outdir = runtimeContext.docker_outdir or random_outdir()
             tmpdir = runtimeContext.docker_tmpdir or "/tmp"
             stagedir = runtimeContext.docker_stagedir or "/var/lib/cwl"
         else:

cwltool/utils.py

@@ -5,7 +5,9 @@
 import os
 import sys
 import platform
+import random
 import shutil
+import string
 import stat
 from functools import partial  # pylint: disable=unused-import
 from typing import (IO, Any, AnyStr,   # pylint: disable=unused-import
@@ -245,3 +247,10 @@ def json_dumps(obj,       # type: Any
     if six.PY2:
         kwargs['encoding'] = 'utf-8'
     return json.dumps(obj, **kwargs)
+
+def random_outdir():
+    """ Return the random directory name chosen to use for tool / workflow output """
+    # compute this once and store it as a function attribute - each subsequent call will return the same value
+    if not hasattr(random_outdir, 'outdir'):
+        random_outdir.outdir = '/' + ''.join([random.choice(string.ascii_letters) for _ in range(6)])
+    return random_outdir.outdir