commit ba2ca72f9a3fbeb07ad6a4a475d0bbcb47631613
author Prudhvi Akhil Alahari <prudhvi@codeaurora.org> Thu Aug 26 00:14:34 2021 +0530
committer Prudhvi Akhil Alahari <prudhvi@codeaurora.org> Mon Sep 13 15:40:59 2021 +0000
tree 64776f3ab0ccc0a17d51b9c795d1893512cc638b
parent d878ab8589c8b4898a36dbbd8dfe06c723b5643b

docker: make sure to cleanup containers before force exit

Observed containers were being left over on the host machine when
docker tests were terminated mid way. Due to this, host machine was not
able to run anymore containers after a certain threshold of running
containers and eventually runs out of available memory. Fix this issue
by always cleaning the containers when exiting from the tests.

Change-Id: I14056ba1e883a40fbd4251d1565da1ee5b102770

test/docker/run.sh

diff --git a/test/docker/run.sh b/test/docker/run.sh
index ef6f771..5b1894d 100755
--- a/test/docker/run.sh
+++ b/test/docker/run.sh
@@ -85,8 +85,7 @@
     usage "$MISSING, did you forget --events-plugin-jar?"
 fi
 [ -n "$GERRIT_WAR" ] && cp -f -- "$GERRIT_WAR" "$ARTIFACTS/gerrit.war"
-progress "Building docker images" build_images
-run_events_plugin_tests ; RESULT=$?
-cleanup
-
-exit "$RESULT"
+( trap cleanup EXIT SIGTERM
+    progress "Building docker images" build_images
+    run_events_plugin_tests
+)