Merge "Added functional CSIT tests for DFC"

[integration/csit.git] / plans / dcaegen2-collectors-hv-ves / testsuites / teardown.sh

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
index ec39215..787f811 100755 (executable)
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
@@ -17,17 +17,35 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+RUN_CSIT_LOCAL=${RUN_CSIT_LOCAL:-false}
+
 cd collector/ssl
 ./gen-certs.sh clean
 cd ../..
 
+if ${RUN_CSIT_LOCAL} ; then
+  echo "Tearing down local setup"
+  source env_local.sh
+else
+  echo "Tearing down"
+  source env.sh
+fi
+
+set +e
+
 COMPOSE_LOGS_FILE=${WORKSPACE}/archives/containers_logs/docker-compose.log
 docker-compose logs > ${COMPOSE_LOGS_FILE}
 docker-compose down
 docker-compose rm -f
 
+echo "Stopping leftover containers"
+LEFTOVER_CONTAINERS=$(docker ps -aqf network=${CONTAINERS_NETWORK} | awk '{print $1}')
+docker stop ${LEFTOVER_CONTAINERS}
+docker rm ${LEFTOVER_CONTAINERS}
 docker network rm ${CONTAINERS_NETWORK}
 
+set -e
+
 if grep "LEAK:" ${COMPOSE_LOGS_FILE}; then
     echo "WARNING: Memory leak detected in docker-compose logs."
 fi