commit cc520b11484f6ef1b8941209730b45056f433406
author Martin Fick <mfick@codeaurora.org> Tue Sep 21 16:23:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 21 16:23:14 2021 +0000
tree 3b3253a6bcc8795b6a8b7211678a2c0f36549de6
parent 86f05a1407f09631aefa31f58aad71ec99b08a03
parent 34b3c6e7f373cabaef1db20d715fe20fab26fb37

Merge "docker: make sure to cleanup containers before force exit" into stable-2.16

test/docker/run.sh

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