Add trap to cri-integration test script

Adelina Tuvenie · Adelina Tuvenie · commit e6538b8bce18 · 2021-08-10T13:37:05.000+03:00
The cri-integration.sh script sets errexit option. This does not
work properly on Bash in Windows, espectially when the script is
piped to something else ( tee in this case ). In this particular
case, the problem arises from the fact that if the script exits
prematurely, it will not get a chance to call test_teardown and
thus clean the remaining containerd process, thus the whole
command will hang indefinetly.

Adding a simple trap on EXIT to call test_teardown will easily
fix this.

Signed-off-by: Adelina Tuvenie &lt;atuvenie@cloudbasesolutions.com&gt;
diff --git a/script/test/cri-integration.sh b/script/test/cri-integration.sh
@@ -21,6 +21,8 @@ set -o pipefail
 basedir="$(dirname "${BASH_SOURCE[0]}")"
 source "${basedir}/utils.sh"
 
+trap test_teardown EXIT
+
 ROOT="$( cd "${basedir}" && pwd )"/../..
 cd "${ROOT}"
 
@@ -46,6 +48,4 @@ ${sudo} bin/cri-integration.test --test.run="${FOCUS}" --test.v \
 
 test_exit_code=$?
 
-test_teardown
-
 exit ${test_exit_code}
