From e37998a4ca44c537901b30215fc50a2223238d21 Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Thu, 25 Jul 2019 14:43:55 +0100 Subject: [PATCH] Geode: FIX - Updates to make builds more stable Change-Id: Ib8d3db4c5f5d181e30a009fc928fb6fbe12b131b --- jjb/geode/apache-geode-test/execute_stressnew.sh | 9 +++++++-- jjb/geode/apache-geode-test/execute_tests.sh | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/jjb/geode/apache-geode-test/execute_stressnew.sh b/jjb/geode/apache-geode-test/execute_stressnew.sh index 5b452fb0..dd75d6bf 100755 --- 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 -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 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 + -- 2.25.1