commit 2070574bb059eb665a3f00e7cba3c1a5380c5334
author a.sreekumar <ajith.sreekumar@est.tech> Fri Feb 14 12:03:33 2020 +0000
committer a.sreekumar <ajith.sreekumar@est.tech> Tue Mar 03 16:08:24 2020 +0000
tree df4ef4c92ef82fdaf527555fcc6f447e3ebf838f
parent 7230b715f5a943b883afd2b9f5fb59ebc50aa387

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>

scripts/policy/docker-compose-drools.yml

diff --git a/scripts/policy/docker-compose-drools.yml b/scripts/policy/docker-compose-drools.yml
index ffee9cd..974b465 100644
--- a/scripts/policy/docker-compose-drools.yml
+++ b/scripts/policy/docker-compose-drools.yml
@@ -1,4 +1,4 @@
-# Copyright 2018 AT&T Intellectual Property. All rights reserved
+# Copyright 2018-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,42 +14,34 @@
 version: '2'
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
-      env_file: config/db/db.conf
+      env_file:
+         - ${WORKSPACE}/scripts/policy/config/db/db.conf
       volumes:
-         - ./config/db:/docker-entrypoint-initdb.d
+         - ${WORKSPACE}/scripts/policy/config/db:/docker-entrypoint-initdb.d
       expose:
-       - 3306
+         - 3306
    nexus:
       image: sonatype/nexus:2.14.8-01
       container_name: nexus
       hostname: nexus
-   pap:
-      image: onap/policy-pe
-      environment:
-       - PRELOAD_POLICIES=${PRELOAD_POLICIES}
-      container_name: pap
-      depends_on: 
-       - mariadb
-      hostname: pap
       expose:
-       - 8443
-       - 9091
-      command: pap
-      volumes:
-       - ./config/pe:/tmp/policy-install/config
+         - 8081
    drools:
-      image: onap/policy-drools
+      image: nexus3.onap.org:10001/onap/policy-drools:${POLICY_DROOLS_VERSION}
+      user: 1000:1000
       container_name: drools
       depends_on: 
-       - mariadb
-       - nexus
+         - mariadb
+         - nexus
       hostname: drools
       expose:
-       - 6969
-       - 9696
+         - 6969
+         - 9696
       volumes:
-       - ./config/drools:/tmp/policy-install/config
+         - ${WORKSPACE}/scripts/policy/config/drools/custom:/tmp/policy-install/config
+      env_file:
+         - ${WORKSPACE}/scripts/policy/config/drools/env/base.conf