[arvados] updated: 2.1.0-2971-g858a8ce23

[git repository hosting]

Summary of changes:
 lib/lsf/dispatch_test.go        | 8 ++++----
 sdk/cwl/tests/test_container.py | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

       via  858a8ce2394b57540f95fa794e894e3315508c8b (commit)
       via  ffd908695009f17311c5f187d46c0b266d223255 (commit)
      from  2b6f6f61757ad01f7d8baf63b190c1e1cd42db41 (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 858a8ce2394b57540f95fa794e894e3315508c8b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Oct 25 16:57:17 2022 -0400

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

diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index cb57b446d..53a94eb45 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -201,6 +201,7 @@ class TestContainer(unittest.TestCase):
         runner.intermediate_output_ttl = 3600
         runner.secret_store = cwltool.secrets.SecretStore()
         runner.api._rootDesc = {"revision": "20210628"}
+        runner.api.config.return_value = {"Containers": {"DefaultKeepCacheDisk": 0}}
 
         keepdocker.return_value = [("zzzzz-4zz18-zzzzzzzzzzzzzz3", "")]
         runner.api.collections().get().execute.return_value = {

commit ffd908695009f17311c5f187d46c0b266d223255
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Oct 25 16:53:45 2022 -0400

    18842: Fix test for default disk cache
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/lsf/dispatch_test.go b/lib/lsf/dispatch_test.go
index e51e71906..e161d11a9 100644
--- a/lib/lsf/dispatch_test.go
+++ b/lib/lsf/dispatch_test.go
@@ -179,10 +179,10 @@ func (stub lsfstub) stubCommand(s *suite, c *check.C) func(prog string, args ...
 				c.Check(args, check.DeepEquals, []string{
 					"-J", s.crPending.ContainerUUID,
 					"-n", "2",
-					"-D", "608MB",
-					"-R", "rusage[mem=608MB:tmp=256MB] span[hosts=1]",
-					"-R", "select[mem>=608MB]",
-					"-R", "select[tmp>=256MB]",
+					"-D", "352MB",
+					"-R", "rusage[mem=352MB:tmp=8448MB] span[hosts=1]",
+					"-R", "select[mem>=352MB]",
+					"-R", "select[tmp>=8448MB]",
 					"-R", "select[ncpus>=2]"})
 				mtx.Lock()
 				fakejobq[nextjobid] = args[1]

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


hooks/post-receive
--