From 9040e28b55cf524d68284a180ab3584074e594da Mon Sep 17 00:00:00 2001
From: Simon Stone <sstone1@uk.ibm.com>
Date: Thu, 25 Jul 2019 09:32:08 +0100
Subject: [PATCH] [FAB-15897] Improve FabCar test logging

Collect logs from all existing Docker containers instead
of just limiting it to a predefined (and incorrect) set.

Also clean up the directory structure for the logs, and
remove any networks/volumes after each test run.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ifcf88baeb9ba4d42f757f7cd23ab2a178ab39b41
---
 scripts/ci_scripts/fabcar.sh | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/scripts/ci_scripts/fabcar.sh b/scripts/ci_scripts/fabcar.sh
index 7a70f74d..2c8ad2ab 100755
--- a/scripts/ci_scripts/fabcar.sh
+++ b/scripts/ci_scripts/fabcar.sh
@@ -3,18 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# docker container list - Check these from basic-network/docker-compose.yaml
-CONTAINER_LIST=(peer0.org1 orderer ca)
-
 logs() {
-
-for CONTAINER in ${CONTAINER_LIST[*]}; do
-    docker logs $CONTAINER.example.com >& $WORKSPACE/$CONTAINER-$1.log
-    echo
-done
-# Write couchdb container logs into couchdb.log file
-docker logs couchdb >& couchdb.log
-
+    LOG_DIRECTORY=$WORKSPACE/fabcar/$1
+    mkdir -p ${LOG_DIRECTORY}
+    CONTAINER_LIST=$(docker ps -a --format '{{.Names}}')
+    for CONTAINER in ${CONTAINER_LIST}; do
+        docker logs ${CONTAINER} > ${LOG_DIRECTORY}/${CONTAINER}.log 2>&1
+    done
 }
 
 copy_logs() {
@@ -65,5 +60,7 @@ for LANGUAGE in ${LANGUAGES}; do
     fi
     docker ps -aq | xargs docker rm -f
     docker rmi -f $(docker images -aq dev-*)
+    docker volume prune -f
+    docker network prune -f
     echo -e "\033[32m finished fabcar test (${LANGUAGE})" "\033[0m"
 done