[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
This commit is contained in:
Simon Stone 2019-07-25 09:32:08 +01:00
parent dcce485561
commit 9040e28b55

View file

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