X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fgeode%2Fapache-geode-test%2Fexecute_tests.sh;h=4c134fb48d8ac0fc13114c060c558eeac60ba59c;hb=d643ea7acf4cd3e57ba89f092d39e0874b8b111c;hp=37231ecd11049c5f12d913e1ce2074b32b69f053;hpb=fcab5c167de0c42fc3ea0a7179ec3e76ae93c507;p=infra%2Fcicd.git

diff --git a/jjb/geode/apache-geode-test/execute_tests.sh b/jjb/geode/apache-geode-test/execute_tests.sh
index 37231ecd..4c134fb4 100755
--- 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
+