From 0e97753e90f5ac38e5f952f6f7e39b02e6aad15d Mon Sep 17 00:00:00 2001 From: Instrumental Date: Sun, 4 Nov 2018 18:01:31 -0600 Subject: Liveness for CSIT Issue-ID: AAF-606 Change-Id: Ia8f243748b79d8ae974f6015e94ebb294b1b1c05 Signed-off-by: Instrumental --- plans/aaf/aafapi/setup.sh | 16 ++++------------ plans/aaf/aafapi/teardown.sh | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh index 114cd7aa..6c88ceb7 100644 --- a/plans/aaf/aafapi/setup.sh +++ b/plans/aaf/aafapi/setup.sh @@ -116,19 +116,11 @@ docker images docker ps -a -docker logs aaf_hello +for C in aaf_service aaf_locate aaf_oauth aaf_cm aaf_gui aaf_hello aaf_fs; do + docker logs $C +done -docker logs aaf_locate - -docker logs aaf_cm - -docker logs aaf_gui - -docker logs aaf_fs - -docker logs aaf_oauth - -docker logs aaf_service +bash ./aaf.sh wait aaf_service AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_service) echo AAF_IP=${AAF_IP} diff --git a/plans/aaf/aafapi/teardown.sh b/plans/aaf/aafapi/teardown.sh index 957bb356..f80c3ad2 100644 --- a/plans/aaf/aafapi/teardown.sh +++ b/plans/aaf/aafapi/teardown.sh @@ -25,6 +25,6 @@ cd "$WORKSPACE/archives/opt/authz/auth/docker" bash dstop.sh bash dstop.sh cass echo "Y" | docker container prune -docker volume remove aaf_config aaf_cass_data +docker volume remove aaf_config aaf_cass_data aaf_status cd - -- cgit 1.2.3-korg