github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-18 09:23:10 +00:00
Code Issues Projects Releases Wiki Activity

tests: Fix indentation in the cri containerd tests

Browse Source 
This PR fixes the indentation in the cri containerd tests as we
have in several places a misalignment in the script.

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
This commit is contained in:
Gabriela Cervantes 2024-09-12 16:18:34 +00:00
parent 614328f342
commit 0346b32a90
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
tests/integration/cri-containerd/integration-tests.sh
View File

@ -458,22 +458,22 @@ function stop_containerd() {
} }
function mountLoopDevice() { function mountLoopDevice() {
local loop_file="$1" local loop_file="$1"
if [ -e "$loop_file" ]; then if [ -e "$loop_file" ]; then
sudo rm -f $loop_file sudo rm -f $loop_file
info "$loop_file was removed" info "$loop_file was removed"
fi fi
sudo dd if=/dev/zero of=$loop_file bs=100M count=2 sudo dd if=/dev/zero of=$loop_file bs=100M count=2
sudo mkfs.ext4 $loop_file sudo mkfs.ext4 $loop_file
sudo losetup -fP $loop_file sudo losetup -fP $loop_file
local loinfo=$(sudo losetup -a | grep $loop_file) local loinfo=$(sudo losetup -a | grep $loop_file)
local device=$(echo "$loinfo" | awk -F'[: ]' '{print $1}') local device=$(echo "$loinfo" | awk -F'[: ]' '{print $1}')
echo $device echo $device
} }
function startDeviceCgroupContainers() { function startDeviceCgroupContainers() {
local pod_yaml=${REPORT_DIR}/device-cgroup-pod.yaml local pod_yaml=${REPORT_DIR}/device-cgroup-pod.yaml
local container1_yaml=${REPORT_DIR}/device-cgroup-container1.yaml local container1_yaml=${REPORT_DIR}/device-cgroup-container1.yaml
local container2_yaml=${REPORT_DIR}/device-cgroup-container2.yaml local container2_yaml=${REPORT_DIR}/device-cgroup-container2.yaml
local image="busybox:latest" local image="busybox:latest"
@ -517,12 +517,12 @@ devices:
permissions: rwm permissions: rwm
EOF EOF
sudo cp "$default_containerd_config" "$default_containerd_config_backup" sudo cp "$default_containerd_config" "$default_containerd_config_backup"
sudo cp $CONTAINERD_CONFIG_FILE "$default_containerd_config" sudo cp $CONTAINERD_CONFIG_FILE "$default_containerd_config"
restart_containerd_service restart_containerd_service
sudo crictl pull $image sudo crictl pull $image
podid=$(sudo crictl runp $pod_yaml) podid=$(sudo crictl runp $pod_yaml)
cid1=$(sudo crictl create $podid $container1_yaml $pod_yaml) cid1=$(sudo crictl create $podid $container1_yaml $pod_yaml)
cid2=$(sudo crictl create $podid $container2_yaml $pod_yaml) cid2=$(sudo crictl create $podid $container2_yaml $pod_yaml)
@ -543,55 +543,55 @@ function stopDeviceCgroupContainers() {
} }
function TestDeviceCgroup() { function TestDeviceCgroup() {
loop_dev1=$(mountLoopDevice "/tmp/device-cgroup-1.img" | tail -n 1) loop_dev1=$(mountLoopDevice "/tmp/device-cgroup-1.img" | tail -n 1)
loop_dev2=$(mountLoopDevice "/tmp/device-cgroup-2.img" | tail -n 1) loop_dev2=$(mountLoopDevice "/tmp/device-cgroup-2.img" | tail -n 1)
info "Two loop devices, $loop_dev1 and $loop_dev2, are created." info "Two loop devices, $loop_dev1 and $loop_dev2, are created."
loop_dev1_container_path="/dev/test-block-1" loop_dev1_container_path="/dev/test-block-1"
loop_dev2_container_path="/dev/test-block-2" loop_dev2_container_path="/dev/test-block-2"
startDeviceCgroupContainers startDeviceCgroupContainers
local dev1_ls=$(sudo crictl exec $cid1 ls -l $loop_dev1_container_path) local dev1_ls=$(sudo crictl exec $cid1 ls -l $loop_dev1_container_path)
local dev1_no=$(echo $dev1_ls | awk '{print $5, $6}') local dev1_no=$(echo $dev1_ls | awk '{print $5, $6}')
local dev1_major=$(echo "${dev1_no%%,*}" | tr -d ' ') local dev1_major=$(echo "${dev1_no%%,*}" | tr -d ' ')
local dev1_minor=$(echo "${dev1_no##*,}" | tr -d ' ') local dev1_minor=$(echo "${dev1_no##*,}" | tr -d ' ')
local dev2_ls=$(sudo crictl exec $cid2 ls -l $loop_dev2_container_path) local dev2_ls=$(sudo crictl exec $cid2 ls -l $loop_dev2_container_path)
local dev2_no=$(echo $dev2_ls | awk '{print $5, $6}') local dev2_no=$(echo $dev2_ls | awk '{print $5, $6}')
local dev2_major=$(echo "${dev2_no%%,*}" | tr -d ' ') local dev2_major=$(echo "${dev2_no%%,*}" | tr -d ' ')
local dev2_minor=$(echo "${dev2_no##*,}" | tr -d ' ') local dev2_minor=$(echo "${dev2_no##*,}" | tr -d ' ')
info "\"$dev1_major:$dev1_minor\" is for container1, and \"$dev2_major:$dev2_minor\" is for container2." info "\"$dev1_major:$dev1_minor\" is for container1, and \"$dev2_major:$dev2_minor\" is for container2."
local cid1_device_cgroup=$(sudo crictl exec $cid1 cat /sys/fs/cgroup/devices/devices.list) local cid1_device_cgroup=$(sudo crictl exec $cid1 cat /sys/fs/cgroup/devices/devices.list)
local cid2_device_cgroup=$(sudo crictl exec $cid2 cat /sys/fs/cgroup/devices/devices.list) local cid2_device_cgroup=$(sudo crictl exec $cid2 cat /sys/fs/cgroup/devices/devices.list)
if [[ $cid1_device_cgroup != *"b $dev1_major:$dev1_minor rwm"* ]]; then if [[ $cid1_device_cgroup != *"b $dev1_major:$dev1_minor rwm"* ]]; then
die "The device cgroup of container1 is expected to have loop dev1" die "The device cgroup of container1 is expected to have loop dev1"
fi fi
info "Container1 has \"b $dev1_major:$dev1_minor rwm\"." info "Container1 has \"b $dev1_major:$dev1_minor rwm\"."
if [[ $cid1_device_cgroup == *"b $dev2_major:$dev2_minor rwm"* ]]; then if [[ $cid1_device_cgroup == *"b $dev2_major:$dev2_minor rwm"* ]]; then
die "The device cgroup of container1 isn't expected to have loop dev2" die "The device cgroup of container1 isn't expected to have loop dev2"
fi fi
info "Container1 doesn't have \"b $dev2_major:$dev2_minor rwm\"." info "Container1 doesn't have \"b $dev2_major:$dev2_minor rwm\"."
if [[ $cid2_device_cgroup == *"b $dev1_major:$dev1_minor rwm"* ]]; then if [[ $cid2_device_cgroup == *"b $dev1_major:$dev1_minor rwm"* ]]; then
die "The device cgroup of container2 isn't expected to have loop dev2" die "The device cgroup of container2 isn't expected to have loop dev2"
fi fi
info "Container2 doesn't have \"b $dev1_major:$dev1_minor rwm\"." info "Container2 doesn't have \"b $dev1_major:$dev1_minor rwm\"."
if [[ $cid2_device_cgroup != *"b $dev2_major:$dev2_minor rwm"* ]]; then if [[ $cid2_device_cgroup != *"b $dev2_major:$dev2_minor rwm"* ]]; then
die "The device cgroup of container2 is expected to have loop dev2" die "The device cgroup of container2 is expected to have loop dev2"
fi fi
info "Container2 has \"b $dev2_major:$dev2_minor rwm\"." info "Container2 has \"b $dev2_major:$dev2_minor rwm\"."
stopDeviceCgroupContainers stopDeviceCgroupContainers
# Umount loop devices # Umount loop devices
sudo losetup -d $loop_dev1 sudo losetup -d $loop_dev1
sudo losetup -d $loop_dev2 sudo losetup -d $loop_dev2
info "Two loop devices, $loop_dev1 and $loop_dev2, are umounted." info "Two loop devices, $loop_dev1 and $loop_dev2, are umounted."
} }
function main() { function main() {