From 57e8cbff6fde22afcf526607e335e033db70be2f Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Wed, 25 Sep 2024 20:36:05 +0200 Subject: [PATCH] tests: Delete custom node debugger pod on EXIT It was observed that the custom node debugger pod is not cleaned up when a test times out. This commit ensures the pod is cleaned up by triggering the cleanup on EXIT, preventing any debugger pods from being left behind. Signed-off-by: Hyounggyu Choi --- .../integration/kubernetes/run_kubernetes_tests.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/integration/kubernetes/run_kubernetes_tests.sh b/tests/integration/kubernetes/run_kubernetes_tests.sh index ab12babc29..86134feb51 100755 --- a/tests/integration/kubernetes/run_kubernetes_tests.sh +++ b/tests/integration/kubernetes/run_kubernetes_tests.sh @@ -10,6 +10,15 @@ set -e kubernetes_dir=$(dirname "$(readlink -f "$0")") source "${kubernetes_dir}/../../common.bash" +cleanup() { + # Clean up all node debugger pods whose name starts with `custom-node-debugger` if pods exist + pods_to_be_deleted=$(kubectl get pods -n kube-system --no-headers -o custom-columns=:metadata.name \ + | grep '^custom-node-debugger' || true) + [ -n "$pods_to_be_deleted" ] && kubectl delete pod -n kube-system $pods_to_be_deleted || true +} + +trap cleanup EXIT + TARGET_ARCH="${TARGET_ARCH:-x86_64}" KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}" K8S_TEST_DEBUG="${K8S_TEST_DEBUG:-false}" @@ -129,11 +138,6 @@ do fi done -# Clean up all node debugger pods whose name starts with `custom-node-debugger` if pods exist -pods_to_be_deleted=$(kubectl get pods -n kube-system --no-headers -o custom-columns=:metadata.name \ - | grep '^custom-node-debugger' || true) -[ -n "$pods_to_be_deleted" ] && kubectl delete pod -n kube-system $pods_to_be_deleted || true - [ ${#tests_fail[@]} -ne 0 ] && die "Tests FAILED from suites: ${tests_fail[*]}" info "All tests SUCCEEDED"