From a84773652c8ea66f444e1c67f5a0d5f1536d4675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sat, 15 Jul 2023 23:16:31 +0200 Subject: [PATCH] ci: cri-containerd: Always use sudo to call crictl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we may get the following error: ``` time="2023-07-15T21:12:13Z" level=fatal msg="validate service connection: validate CRI v1 runtime API for endpoint \"unix:///run/containerd/containerd.sock\": rpc error: code = Unavailable desc = connection error: desc = \"transport: Error while dialing dial unix /run/containerd/containerd.sock: connect: permission denied\"" ``` Signed-off-by: Fabiano Fidêncio --- .../integration/cri-containerd/integration-tests.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh index 79ba92af0..5246621f2 100755 --- a/tests/integration/cri-containerd/integration-tests.sh +++ b/tests/integration/cri-containerd/integration-tests.sh @@ -247,7 +247,7 @@ function TestContainerMemoryUpdate() { testContainerStart - vm_size=$(($(crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024)) + vm_size=$(($(sudo crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024)) if [ $vm_size -gt $((2*1024*1024*1024)) ] || [ $vm_size -lt $((2*1024*1024*1024-128*1024*1024)) ]; then testContainerStop die "The VM memory size $vm_size before update is not right" @@ -256,7 +256,7 @@ function TestContainerMemoryUpdate() { sudo crictl update --memory $((2*1024*1024*1024)) $cid sleep 1 - vm_size=$(($(crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024)) + vm_size=$(($(sudo crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024)) if [ $vm_size -gt $((4*1024*1024*1024)) ] || [ $vm_size -lt $((4*1024*1024*1024-128*1024*1024)) ]; then testContainerStop die "The VM memory size $vm_size after increase is not right" @@ -266,7 +266,7 @@ function TestContainerMemoryUpdate() { sudo crictl update --memory $((1*1024*1024*1024)) $cid sleep 1 - vm_size=$(($(crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024)) + vm_size=$(($(sudo crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024)) if [ $vm_size -gt $((3*1024*1024*1024)) ] || [ $vm_size -lt $((3*1024*1024*1024-128*1024*1024)) ]; then testContainerStop die "The VM memory size $vm_size after decrease is not right" @@ -277,10 +277,10 @@ function TestContainerMemoryUpdate() { } function getContainerSwapInfo() { - swap_size=$(($(crictl exec $cid cat /proc/meminfo | grep "SwapTotal:" | awk '{print $2}')*1024)) + swap_size=$(($(sudo crictl exec $cid cat /proc/meminfo | grep "SwapTotal:" | awk '{print $2}')*1024)) # NOTE: these below two checks only works on cgroup v1 - swappiness=$(crictl exec $cid cat /sys/fs/cgroup/memory/memory.swappiness) - swap_in_bytes=$(crictl exec $cid cat /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes) + swappiness=$(sudo crictl exec $cid cat /sys/fs/cgroup/memory/memory.swappiness) + swap_in_bytes=$(sudo crictl exec $cid cat /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes) } function TestContainerSwap() {