X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=plans%2Fdcaegen2-collectors-hv-ves%2Ftestsuites%2Fteardown.sh;h=bed9742c20955ccd69c037735e6708d0b9d71a13;hb=f5f137474a93d9c2ebd107c06fa4010104791c67;hp=28f1033464333af17c44ac00a981706be706e31a;hpb=d2da2cc4bd18fe33124dd105608443c10f981a2d;p=integration%2Fcsit.git

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
index 28f10334..bed9742c 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
@@ -1,16 +1,59 @@
 #!/usr/bin/env bash
+# ============LICENSE_START=======================================================
+# csit-dcaegen2-collectors-hv-ves
+# ================================================================================
+# Copyright (C) 2018-2019 NOKIA
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
+RUN_CSIT_LOCAL=${RUN_CSIT_LOCAL:-false}
 
 cd collector/ssl
 ./gen-certs.sh clean
 cd ../..
 
-COMPOSE_LOGS_FILE=${WORKSPACE}/archives/containers_logs/docker-compose.log
+if ${RUN_CSIT_LOCAL} ; then
+  echo "Tearing down local setup"
+  source env_local.sh
+else
+  echo "Tearing down"
+  source env.sh
+fi
+
+set +e
+
+METRICS_FILE=${WORKSPACE}/archives/containers_logs/collector-metrics.dump
+docker-compose exec hv-ves-collector curl -qs localhost:6060/monitoring/prometheus > ${METRICS_FILE}
+
+CONTAINER_LOGS=${WORKSPACE}/archives/containers_logs/
+COMPOSE_LOGS_FILE=${CONTAINER_LOGS}/docker-compose.log
+
+docker-compose logs hv-ves-collector > ${CONTAINER_LOGS}/hv-ves-collector.log
+docker-compose logs unencrypted-hv-ves-collector > ${CONTAINER_LOGS}/unencrypted-hv-ves-collector.log
+docker-compose logs dcae-app-simulator > ${CONTAINER_LOGS}/dcae-app-simulator.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