[ARVADOS] updated: 2.1.0-1180-gcb33e4c24

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/executor.py | 6 ++++++
 1 file changed, 6 insertions(+)

       via  cb33e4c24bd396b223c455ad91a18691e0d59f72 (commit)
      from  0e8c57a68f5d69ce642cc27fb481495a318c4d1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cb33e4c24bd396b223c455ad91a18691e0d59f72
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Aug 10 16:59:21 2021 -0400

    17390: Use cluster-configured default
    
    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 6a565b10a..6d4f1bd52 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -549,6 +549,12 @@ 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 = [k for k,v in self.api.config()["StorageClasses"].items() if v.get("Default") is True].join(",")
+        if runtimeContext.storage_classes == "default":
+            runtimeContext.storage_classes = default_storage_classes
+        if runtimeContext.intermediate_storage_classes == "default":
+            runtimeContext.intermediate_storage_classes = default_storage_classes
+
         if not runtimeContext.name:
             runtimeContext.name = self.name = updated_tool.tool.get("label") or updated_tool.metadata.get("label") or os.path.basename(updated_tool.tool["id"])
 

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


hooks/post-receive
--