diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-10-02 16:09:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-02 16:09:08 +0000 |
| commit | b6c2b7191c3c27314c16722434145911f6228fb6 (patch) | |
| tree | 66047663bbdd55dde8bf90f81ebba0e46529c2e1 /plans/aaf | |
| parent | e6911698d70086884bec982609160c61436d9bf3 (diff) | |
| parent | 73fcc3958c2d61646392b2c0bccc4f7017a531eb (diff) | |
Merge "DDD implementation"
Diffstat (limited to 'plans/aaf')
| -rw-r--r-- | plans/aaf/aafapi/setup.sh | 3 | ||||
| -rw-r--r-- | plans/aaf/sms-test-plan/teardown.sh | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh index add9ae17..dd6cb29e 100644 --- a/plans/aaf/aafapi/setup.sh +++ b/plans/aaf/aafapi/setup.sh @@ -44,8 +44,7 @@ export cassandra_service=$(get_docker_compose_service cassandra_container) for i in {1..12}; do if [ $(docker inspect --format '{{ .State.Running }}' $aaf_service) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' $cassandra_service) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' $aaf_service) ] + [ $(docker inspect --format '{{ .State.Running }}' $cassandra_service) ] then echo "AAF Service Running" break diff --git a/plans/aaf/sms-test-plan/teardown.sh b/plans/aaf/sms-test-plan/teardown.sh index 2c8b3e89..fa5c218f 100644 --- a/plans/aaf/sms-test-plan/teardown.sh +++ b/plans/aaf/sms-test-plan/teardown.sh @@ -15,11 +15,5 @@ # limitations under the License. # -docker cp sms:/sms/sms.log . -cat sms.log -rm sms.log -rm -rf config -docker stop sms vault -docker rm sms vault -docker rmi nexus3.onap.org:10001/onap/aaf/sms -docker rmi docker.io/vault:0.10.0 +kill-instance.sh sms +kill-instance.sh vault |