summaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorMariusz Wagner <mariusz.wagner@nokia.com>2018-10-02 12:13:14 +0200
committerMariusz Wagner <mariusz.wagner@nokia.com>2018-10-02 12:13:14 +0200
commit73fcc3958c2d61646392b2c0bccc4f7017a531eb (patch)
treee23d7482c0a5338da3a0910ef44aa66db86925a3 /plans
parentc078eea2b2809a22aad21f1b4f8c49d018ece7b6 (diff)
DDD implementation
Issue-ID: INT-676 Change-Id: I970eda81a081acab7401f0b213d6e675b5570871 Signed-off-by: Mariusz Wagner <mariusz.wagner@nokia.com>
Diffstat (limited to 'plans')
-rw-r--r--plans/aaf/aafapi/setup.sh3
-rw-r--r--plans/aaf/sms-test-plan/teardown.sh10
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