From: Tom Clegg Date: Fri, 9 Dec 2022 21:05:48 +0000 (-0500) Subject: Merge branch '19840-docker-port-number' X-Git-Tag: 2.5.0~12 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a46c78bdc3c2136236e6fff2e17b32d3c78ca772?hp=11ba8237405d2424bd08da61be75e5ff73883f18 Merge branch '19840-docker-port-number' fixes #19840 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go index 4c49c007eb..c532efa0b6 100644 --- a/lib/controller/integration_test.go +++ b/lib/controller/integration_test.go @@ -1133,7 +1133,7 @@ func (s *IntegrationSuite) TestRunTrivialContainer(c *check.C) { "environment": map[string]string{}, "mounts": map[string]arvados.Mount{"/out": {Kind: "tmp", Capacity: 10000}}, "output_path": "/out", - "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1}, + "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1, KeepCacheRAM: 1 << 26}, "priority": 1, "state": arvados.ContainerRequestStateCommitted, }, 0) @@ -1160,7 +1160,7 @@ func (s *IntegrationSuite) TestContainerInputOnDifferentCluster(c *check.C) { "/out": {Kind: "tmp", Capacity: 10000}, }, "output_path": "/out", - "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1}, + "runtime_constraints": arvados.RuntimeConstraints{RAM: 100000000, VCPUs: 1, KeepCacheRAM: 1 << 26}, "priority": 1, "state": arvados.ContainerRequestStateCommitted, "container_count_max": 1,