[arvados] updated: 2.1.0-3155-g5d0007f07

[git repository hosting]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

       via  5d0007f0798d34619a21e447f12c34ac2023f2fb (commit)
      from  044654c3fc20e8cd98cbea88f1681ee394347b8c (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 5d0007f0798d34619a21e447f12c34ac2023f2fb
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Dec 6 13:41:42 2022 -0500

    19847: Fix KeepCacheTypeRequirement
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index fde9db384..4be2e2bd7 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -266,11 +266,14 @@ class ArvadosContainer(JobBase):
 
         use_disk_cache = (self.arvrunner.api.config()["Containers"].get("DefaultKeepCacheDisk", 0) > 0)
 
+        keep_cache_type_req, _ = self.get_requirement("http://arvados.org/cwl#KeepCacheTypeRequirement")
+        if keep_cache_type_req:
+            if "keepCacheType" in keep_cache_type_req:
+                if keep_cache_type_req["keepCacheType"] == "ram_cache":
+                    use_disk_cache = False
+
         runtime_req, _ = self.get_requirement("http://arvados.org/cwl#RuntimeConstraints")
         if runtime_req:
-            if "keepCacheType" in runtime_req:
-                if cache_type == "ram_cache":
-                    use_disk_cache = False
             if "keep_cache" in runtime_req:
                 if use_disk_cache:
                     # If DefaultKeepCacheDisk is non-zero it means we should use disk cache.

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


hooks/post-receive
--