CSIT fixes for frankfurt breakage

CSITs as per the latest policy type validation changes.
Drools and drools apps fixes.
Removed policy-health.

Change-Id: I086bf747059435e12d15e0481b00c97c20eaadc1
Issue-ID: POLICY-1402
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>

2 files changed, 17 insertions, 18 deletions

diff --git a/plans/policy/drools-applications/setup.sh b/plans/policy/drools-applications/setup.sh
index e550cdb0..c66c4929 100755
--- a/plans/policy/drools-applications/setup.sh
+++ b/plans/policy/drools-applications/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+#  Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+
+# OS upgrades
+
 source ${SCRIPTS}/policy/config/policy-csit.conf
 export POLICY_MARIADB_VER
 echo ${GERRIT_BRANCH}
@@ -32,18 +35,15 @@ echo ${POLICY_DROOLS_APPS_VERSION_EXTRACT}
 export POLICY_DROOLS_APPS_VERSION="${POLICY_DROOLS_APPS_VERSION_EXTRACT:0:3}-SNAPSHOT-latest"
 echo ${POLICY_DROOLS_APPS_VERSION}
 
-docker login -u docker -p docker nexus3.onap.org:10001
+echo "user information: $(id)"
+echo "docker and docker-compose versions:"
+docker -v && docker-compose -v
 
-# Adding this waiting container to avoid race condition between api and mariadb containers.
-docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-drools-apps.yml run --rm start_dependencies
-docker logs mariadb
 docker container ls -a
 
 docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-drools-apps.yml up -d
-sleep 1m
+sleep 2m
 
-docker logs mariadb
-docker logs drools
 docker container ls -a
 
 POLICY_DROOLS_IP=`get-instance-ip.sh drools`
@@ -52,17 +52,13 @@ MARIADB_IP=`get-instance-ip.sh mariadb`
 echo DROOLS IP IS ${POLICY_DROOLS_IP}
 echo MARIADB IP IS ${MARIADB_IP}
 
-# Wait for initialization
-for i in {1..10}; do
-   curl -sS ${MARIADB_IP}:3306 && break
-   echo sleep $i
-   sleep $i
-done
-
 for i in {1..10}; do
    curl -sS ${POLICY_DROOLS_IP}:6969 && break
    echo sleep $i
    sleep $i
 done
 
+# to give enough time to the usecases controller to come up
+sleep 2m
+
 ROBOT_VARIABLES="-v POLICY_DROOLS_IP:${POLICY_DROOLS_IP}"
diff --git a/plans/policy/drools-applications/teardown.sh b/plans/policy/drools-applications/teardown.sh
index 48ab171d..886b1ea3 100755
--- a/plans/policy/drools-applications/teardown.sh
+++ b/plans/policy/drools-applications/teardown.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright 2020 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-kill-instance.sh drools
-kill-instance.sh mariadb
+
+mkdir -p $WORKSPACE/archives/
+
+docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-drools-apps.yml logs > $WORKSPACE/archives/docker-compose-drools-apps.log
+docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-drools-apps.yml down -v