INFRA: Switch to tox for JJB verify and merge jobs

[infra/cicd.git] / jjb / geode / apache-geode-test / execute_tests.sh

diff --git a/jjb/geode/apache-geode-test/execute_tests.sh b/jjb/geode/apache-geode-test/execute_tests.sh
index 37231ecd11049c5f12d913e1ce2074b32b69f053..4c134fb48d8ac0fc13114c060c558eeac60ba59c 100755 (executable)
--- a/jjb/geode/apache-geode-test/execute_tests.sh
+++ b/jjb/geode/apache-geode-test/execute_tests.sh
@@ -93,5 +93,10 @@ eval "${EXEC_COMMAND}"
 
 # Cleanup
 # Make sure all test containers are stopped and removed when tests are finished
-docker stop $(docker ps -a -q)
-docker rm $(docker ps -a -q)
\ No newline at end of file
+DOCKER_CONTAINERS=$(sudo docker ps -a -q 2> /dev/null)
+if [ -n "${DOCKER_CONTAINERS}" ]; then
+  docker stop ${DOCKER_CONTAINERS} > /dev/null
+  echo -e  "Removing containers with ID:"
+  docker rm ${DOCKER_CONTAINERS}
+fi
+