From: Tom Clegg <tom@curii.com>
Date: Tue, 25 May 2021 21:11:38 +0000 (-0400)
Subject: 17296: Avoid memory-limiting feature in tests.
X-Git-Tag: 2.3.0~201^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0ec724dfa221b25170205e05bfb30219d821d6de

17296: Avoid memory-limiting feature in tests.

Tests should pass if the kernel feature is not enabled.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index 32c60e699a..a39b754b3d 100644
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -85,7 +85,7 @@ func (e *dockerExecutor) Create(spec containerSpec) error {
 	for k, v := range spec.Env {
 		cfg.Env = append(cfg.Env, k+"="+v)
 	}
-	if spec.RAM < minDockerRAM {
+	if spec.RAM > 0 && spec.RAM < minDockerRAM {
 		spec.RAM = minDockerRAM
 	}
 	hostCfg := dockercontainer.HostConfig{