github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 12:44:39 +00:00
Code Issues Projects Releases Wiki Activity

ci: cri-containerd: Add function before each function

Browse Source 
We've been doing this for all files moved to this repo.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-07-15 09:30:23 +02:00
parent fde22d6bce
commit 7f3b309997
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ readonly kata_config="/etc/kata-containers/configuration.toml"
readonly kata_config_backup="$kata_config.backup" readonly kata_config_backup="$kata_config.backup"
readonly default_kata_config="/opt/kata/share/defaults/kata-containers/configuration.toml" readonly default_kata_config="/opt/kata/share/defaults/kata-containers/configuration.toml"
ci_config() { function ci_config() {
sudo mkdir -p $(dirname "${kata_config}") sudo mkdir -p $(dirname "${kata_config}")
[ -f "$kata_config" ] && sudo cp "$kata_config" "$kata_config_backup" || \ [ -f "$kata_config" ] && sudo cp "$kata_config" "$kata_config_backup" || \
sudo cp "$default_kata_config" "$kata_config" sudo cp "$default_kata_config" "$kata_config"
@ -59,7 +59,7 @@ ci_config() {
sudo sed -i 's/^#enable_debug =/enable_debug =/g' ${kata_config} sudo sed -i 's/^#enable_debug =/enable_debug =/g' ${kata_config}
} }
ci_cleanup() { function ci_cleanup() {
source /etc/os-release || source /usr/lib/os-release source /etc/os-release || source /usr/lib/os-release
if [ -n "${FACTORY_TEST}" ]; then if [ -n "${FACTORY_TEST}" ]; then
@ -77,7 +77,7 @@ ci_cleanup() {
sudo rm "$kata_config" sudo rm "$kata_config"
} }
create_containerd_config() { function create_containerd_config() {
local runtime="$1" local runtime="$1"
# kata_annotations is set to 1 if caller want containerd setup with # kata_annotations is set to 1 if caller want containerd setup with
# kata annotations support. # kata annotations support.
@ -117,14 +117,14 @@ fi
} }
cleanup() { function cleanup() {
ci_cleanup ci_cleanup
[ -d "$tmp_dir" ] && rm -rf "${tmp_dir}" [ -d "$tmp_dir" ] && rm -rf "${tmp_dir}"
} }
trap cleanup EXIT trap cleanup EXIT
err_report() { function err_report() {
local log_file="${REPORT_DIR}/containerd.log" local log_file="${REPORT_DIR}/containerd.log"
if [ -f "$log_file" ]; then if [ -f "$log_file" ]; then
echo "ERROR: containerd log :" echo "ERROR: containerd log :"
@ -135,7 +135,7 @@ err_report() {
} }
check_daemon_setup() { function check_daemon_setup() {
info "containerd(cri): Check daemon works with runc" info "containerd(cri): Check daemon works with runc"
create_containerd_config "runc" create_containerd_config "runc"
@ -152,7 +152,7 @@ check_daemon_setup() {
make GO_BUILDTAGS="no_btrfs" -e cri-integration make GO_BUILDTAGS="no_btrfs" -e cri-integration
} }
testContainerStart() { function testContainerStart() {
# no_container_yaml set to 1 will not create container_yaml # no_container_yaml set to 1 will not create container_yaml
# because caller has created its own container_yaml. # because caller has created its own container_yaml.
no_container_yaml=${1-0} no_container_yaml=${1-0}
@ -189,7 +189,7 @@ EOF
sudo crictl start $cid sudo crictl start $cid
} }
testContainerStop() { function testContainerStop() {
info "stop pod $podid" info "stop pod $podid"
sudo crictl stopp $podid sudo crictl stopp $podid
info "remove pod $podid" info "remove pod $podid"
@ -199,7 +199,7 @@ testContainerStop() {
restart_containerd_service restart_containerd_service
} }
TestKilledVmmCleanup() { function TestKilledVmmCleanup() {
if [[ "${KATA_HYPERVISOR}" != "qemu" ]]; then if [[ "${KATA_HYPERVISOR}" != "qemu" ]]; then
info "TestKilledVmmCleanup is skipped for ${KATA_HYPERVISOR}, only QEMU is currently tested" info "TestKilledVmmCleanup is skipped for ${KATA_HYPERVISOR}, only QEMU is currently tested"
return 0 return 0
@ -222,7 +222,7 @@ TestKilledVmmCleanup() {
info "stop containerd" info "stop containerd"
} }
TestContainerMemoryUpdate() { function TestContainerMemoryUpdate() {
if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
return return
fi fi
@ -273,14 +273,14 @@ TestContainerMemoryUpdate() {
testContainerStop testContainerStop
} }
getContainerSwapInfo() { function getContainerSwapInfo() {
swap_size=$(($(crictl exec $cid cat /proc/meminfo | grep "SwapTotal:" | awk '{print $2}')*1024)) swap_size=$(($(crictl exec $cid cat /proc/meminfo | grep "SwapTotal:" | awk '{print $2}')*1024))
# NOTE: these below two checks only works on cgroup v1 # NOTE: these below two checks only works on cgroup v1
swappiness=$(crictl exec $cid cat /sys/fs/cgroup/memory/memory.swappiness) 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) swap_in_bytes=$(crictl exec $cid cat /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes)
} }
TestContainerSwap() { function TestContainerSwap() {
if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" != "x86_64" ]]; then if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" != "x86_64" ]]; then
return return
fi fi
@ -402,14 +402,14 @@ EOF
} }
# k8s may restart docker which will impact on containerd stop # k8s may restart docker which will impact on containerd stop
stop_containerd() { function stop_containerd() {
local tmp=$(pgrep kubelet || true) local tmp=$(pgrep kubelet || true)
[ -n "$tmp" ] && sudo kubeadm reset -f [ -n "$tmp" ] && sudo kubeadm reset -f
sudo systemctl stop containerd sudo systemctl stop containerd
} }
main() { function main() {
info "Stop crio service" info "Stop crio service"
systemctl is-active --quiet crio && sudo systemctl stop crio systemctl is-active --quiet crio && sudo systemctl stop crio