Geode: FIX - Updates to make builds more stable

Change-Id: Ib8d3db4c5f5d181e30a009fc928fb6fbe12b131b

diff --git a/jjb/geode/apache-geode-test/execute_stressnew.sh b/jjb/geode/apache-geode-test/execute_stressnew.sh
index 5b452fb051fd8414928f716e75ee47982516ee6f..dd75d6bf75c0450dd21aecbfc272d2f66e717f9b 100755 (executable)
--- a/jjb/geode/apache-geode-test/execute_stressnew.sh
+++ b/jjb/geode/apache-geode-test/execute_stressnew.sh
@@ -160,5 +160,10 @@ eval "${EXEC_COMMAND}"
 
 # Cleanup
 # Make sure all test containers are stopped and removed when tests are finished
 
 # 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
+

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
 
 # 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
+