From 9d8ae6d68ea8427052ec45326e22f3a2ea7ed081 Mon Sep 17 00:00:00 2001 From: Alexander Dehn Date: Thu, 28 Apr 2022 16:14:09 +0000 Subject: Refactore SDNC/R robot test suite for K-Release add improvements SDNC ready state detection Issue-ID: SDNC-1682 Signed-off-by: Alexander Dehn Change-Id: I6b9829b5187f9c27ff9c2fab6b9a7381ce563b25 Former-commit-id: 83da3b4380d992d5891ed8e35b305358db9af4ff --- csit/scripts/sdnr/sdnr-teardown.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'csit/scripts/sdnr/sdnr-teardown.sh') diff --git a/csit/scripts/sdnr/sdnr-teardown.sh b/csit/scripts/sdnr/sdnr-teardown.sh index eeb729e0..02e8beeb 100755 --- a/csit/scripts/sdnr/sdnr-teardown.sh +++ b/csit/scripts/sdnr/sdnr-teardown.sh @@ -15,6 +15,7 @@ # limitations under the License. # # Modifications copyright (c) 2018 AT&T Intellectual Property +# Modifications copyright (C) 2022 highstreet technologies GmbH Intellectual Property # if [[ -z $WORKSPACE ]]; then @@ -37,7 +38,7 @@ source ${SCRIPTS}/sdnr/sdnrEnv_Common.sh env_file="--env-file ${SCRIPTS}/sdnr/docker-compose/.env" function sdnr_teardown() { - running_containers=$(docker ps -aq) + running_containers=$(docker ps -a --format "{{.Names}}") if [ -z "$running_containers" ] then echo "No containers to get logs from!" @@ -50,6 +51,7 @@ function sdnr_teardown() { echo "Getting logs from container $i" docker logs $i >> ${WORKSPACE}/archives/getallinfo/$i.log 2>&1 done + docker cp sdnr:/opt/opendaylight/data/log/karaf.log ${WORKSPACE}/archives/getallinfo/sdnr_karaf.log fi echo "Starting teardown!" # removes sdnrdb, sdnr AND all of the rest of the containers (--remove-orphans) -- cgit 1.2.3-korg