diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2019-08-19 12:28:41 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2019-08-19 12:28:41 +0000 |
| commit | 9bcd0914f24482365b115e31ec277c7d5b805e93 (patch) | |
| tree | 3f1d5d5420de7e80a71f7f484c62ca344d1434ed /start-container-docker.sh | |
| parent | 25c9fa9cdf6009af8e4a934500040d1f0d9d9a4e (diff) | |
start-container-docker.sh: Remove most of ssh traces
Now that we have debugged & fixed the race condition thanks to ssh -S
none, we can remove most of ssh traces to make logs easier to read.
Change-Id: I4d7e1d1e174edb56ba6446069d4349ab947fd943
Diffstat (limited to 'start-container-docker.sh')
| -rwxr-xr-x | start-container-docker.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh index ca2c5171..db705c68 100755 --- a/start-container-docker.sh +++ b/start-container-docker.sh @@ -214,7 +214,7 @@ image=linaro/ci-${container_arch}-tcwg-${task}-ubuntu:${distro} # builds SSH="ssh -S none" -DOCKER="$SSH -v $session_host docker" +DOCKER="$SSH $session_host docker" $DOCKER pull $image || ssh_error $? SECURITY="--cap-add=SYS_PTRACE" @@ -228,7 +228,7 @@ SECURITY="--cap-add=SYS_PTRACE" SECURITY="${SECURITY} --security-opt seccomp:unconfined" # Reserve resources according to weight and task -nproc=$($SSH -v $session_host nproc --all) +nproc=$($SSH $session_host nproc --all) memory=$(print_memory_limit "$task" "$weight" "$nproc") pids=$(print_pids_limit "$task" "$weight") cpus=$(print_cpu_shares "$task" "$weight") @@ -245,7 +245,7 @@ for bind_mount in "${bind_mounts[@]}"; do # If a host bind-mount dir doesn't exist, then docker creates it on # the host with root:root owner, which can't be removed by cleanup job. dir="${bind_mount%%:*}" - $SSH -v $session_host mkdir -p "$dir" + $SSH $session_host mkdir -p "$dir" docker_dir=$(print_docker_path "$dir") bind_mounts_opt=("${bind_mounts_opt[@]}" "-v" "$docker_dir:$bind_mount") |