[ARVADOS] created: 2.1.0-1420-ga0352b210

[Git user]

        at  a0352b2102ff74013893120d1267d5a38a0e4136 (commit)


commit a0352b2102ff74013893120d1267d5a38a0e4136
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Oct 1 10:02:40 2021 -0400

    18238: Make backwards compatible when StorageClasses is not in config
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index edb9d5b52..db1db2816 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -549,7 +549,7 @@ The 'jobs' API is no longer supported.
         if runtimeContext.submit_request_uuid and self.work_api != "containers":
             raise Exception("--submit-request-uuid requires containers API, but using '{}' api".format(self.work_api))
 
-        default_storage_classes = ",".join([k for k,v in self.api.config()["StorageClasses"].items() if v.get("Default") is True])
+        default_storage_classes = ",".join([k for k,v in self.api.config().get("StorageClasses", {"default": {"Default": True}}).items() if v.get("Default") is True])
         if runtimeContext.storage_classes == "default":
             runtimeContext.storage_classes = default_storage_classes
         if runtimeContext.intermediate_storage_classes == "default":

commit 83492ceff77529aa93e833e5df6b9414eb21c3b1
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Sep 30 16:13:28 2021 -0400

    18238: Add required container_engine parameter to builder
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 66dff809e..126a2b511 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -105,7 +105,8 @@ def make_builder(joborder, hints, requirements, runtimeContext, metadata):
                  outdir="",              # type: Text
                  tmpdir="",              # type: Text
                  stagedir="",            # type: Text
-                 cwlVersion=metadata.get("http://commonwl.org/cwltool#original_cwlVersion") or metadata.get("cwlVersion")
+                 cwlVersion=metadata.get("http://commonwl.org/cwltool#original_cwlVersion") or metadata.get("cwlVersion"),
+                 container_engine="docker"
                 )
 
 def search_schemadef(name, reqs):

commit 1e56e730b6e819ec831229c1fceedcbef782f59f
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Sep 30 10:18:12 2021 -0400

    18238: Update cwltool and schema-salad deps
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 3f1f8a6be..0bde76e92 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -39,8 +39,8 @@ setup(name='arvados-cwl-runner',
       # file to determine what version of cwltool and schema-salad to
       # build.
       install_requires=[
-          'cwltool==3.1.20210816212154',
-          'schema-salad==8.2.20210902094147',
+          'cwltool==3.1.20210922203925',
+          'schema-salad==8.2.20210918131710',
           'arvados-python-client{}'.format(pysdk_dep),
           'setuptools',
           'ciso8601 >= 2.0.0',

-----------------------------------------------------------------------


hooks/post-receive
--