diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-07-19 13:03:02 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-07-26 10:12:26 +0000 |
| commit | 268e16e2ba1eaef8e211d6a0728c92f8cbde14c0 (patch) | |
| tree | 0107e824671646d8e1b49629ea6133e906a5b182 /start-container-docker.sh | |
| parent | 3922f589ab98b50295674d01287ed7fc693bbb47 (diff) | |
start-container-docker.sh: Use at most half of RAM on normal builders
This reverts commit 73ab5ac992942292817b1441472d325ed4c553be.
Change-Id: Ia4148af0ac04a5f75b63d5c5af5a334939a39a03
Diffstat (limited to 'start-container-docker.sh')
| -rwxr-xr-x | start-container-docker.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh index 71dec51f..a1e30b51 100755 --- a/start-container-docker.sh +++ b/start-container-docker.sh @@ -246,13 +246,15 @@ SECURITY="${SECURITY} --security-opt seccomp:unconfined" # Reserve resources according to weight and task nproc=$($SSH $session_host nproc --all) +memlimit=$($SSH $session_host free -m | awk '/^Mem/ { print $2 }') + pids=$(print_pids_limit "$task" "$weight") cpus=$(print_cpu_shares "$task" "$weight") +memory=$(print_memory_limit "$task" "$weight" "$nproc" "$memlimit") -memory=$(print_memory_limit "$task" "$weight") -memory_opt="--memory=${memory}M" -if [ x"$memory" = x"unlimited" ]; then - memory_opt="" +memory_opt="" +if [ x"$memory" != x"unlimited" ]; then + memory_opt="--memory=${memory}M" fi if [ x"${JOB_NAME:+set}" = x"set" ]; then |