Restructure of CSIT scripts

- CSIT robot test suits are now compiled into a docker image
- dependencies are now installed as part of Dockerfile build

Issue-ID: POLICY-4987
Change-Id: I5ae4e9f58471a6038c25548d9392ece78b20e67a
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

10 files changed, 513 insertions, 472 deletions

diff --git a/compose/config/drools-applications/custom/feature-lifecycle.properties b/compose/config/drools-applications/custom/feature-lifecycle.properties
index 053cd066..a68fb5ca 100644
--- a/compose/config/drools-applications/custom/feature-lifecycle.properties
+++ b/compose/config/drools-applications/custom/feature-lifecycle.properties
@@ -23,17 +23,18 @@ lifecycle.pdp.type=${envd:POLICY_PDP_PAP_TYPE:drools}
 # Mandatory policy types that this PDP-D must support at a minimum
 lifecycle.pdp.policytypes=${envd:POLICY_PDP_PAP_POLICYTYPES}
 
-kafka.source.topics=policy-pdp-pap
-kafka.sink.topics=policy-pdp-pap
-kafka.source.topics.fetchTimeout=15000
+kafka.source.topics=${envd:POLICY_PDP_PAP_TOPIC}
+kafka.sink.topics=${envd:POLICY_PDP_PAP_TOPIC}
 kafka.source.topics.policy-pdp-pap.fetchTimeout=15000
 
-kafka.source.topics.policy-pdp-pap.servers=kafka:9092
+kafka.source.topics.policy-pdp-pap.servers=${envd:KAFKA_SERVERS}
 kafka.source.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
 kafka.source.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
 kafka.source.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
+kafka.source.topics.policy-pdp-pap.https=${envd:KAFKA_HTTPS:false}
 
-kafka.sink.topics.policy-pdp-pap.servers=kafka:9092
+kafka.sink.topics.policy-pdp-pap.servers=${envd:KAFKA_SERVERS}
 kafka.sink.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
 kafka.sink.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
 kafka.sink.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
+kafka.sink.topics.policy-pdp-pap.https=${envd:KAFKA_HTTPS:false}
diff --git a/compose/config/drools-applications/env/base.conf b/compose/config/drools-applications/env/base.conf
index 7f213ead..0f677239 100644
--- a/compose/config/drools-applications/env/base.conf
+++ b/compose/config/drools-applications/env/base.conf
@@ -60,6 +60,11 @@ MYSQL_CMD=
 HTTP_SERVER_HTTPS=false
 PROMETHEUS=true
 
+# kafka server
+
+KAFKA_SERVERS=kafka:9092
+KAFKA_HTTPS=false
+
 # LIVENESS Checks
 
 LIVENESS_CONTROLLERS=*
@@ -67,6 +72,7 @@ LIVENESS_CONTROLLERS=*
 # PDP-D Kafka configuration channel
 
 PDPD_CONFIGURATION_TOPIC=pdpd-configuration
+PDPD_CONFIGURATION_SERVERS=kafka:9092
 PDPD_CONFIGURATION_API_KEY=
 PDPD_CONFIGURATION_API_SECRET=
 PDPD_CONFIGURATION_CONSUMER_GROUP=
@@ -78,6 +84,7 @@ PDPD_CONFIGURATION_PARTITION_KEY=
 POLICY_PDP_PAP_TOPIC=policy-pdp-pap
 POLICY_PDP_PAP_API_KEY=
 POLICY_PDP_PAP_API_SECRET=
+POLICY_PDP_PAP_POLICYTYPES=onap.policies.controlloop.operational.common.Drools
 
 # PAP
 
@@ -101,7 +108,6 @@ DCAE_TOPIC=unauthenticated.dcae_cl_output
 DCAE_SERVERS=kafka:9092
 DCAE_CONSUMER_GROUP=dcae.policy.shared
 
-
 # AAI
 
 AAI_HOST=aai-sim
diff --git a/compose/config/drools-applications/env/feature-pooling-messages.conf b/compose/config/drools-applications/env/feature-pooling-messages.conf
index f90a9f04..967ae7bf 100644
--- a/compose/config/drools-applications/env/feature-pooling-messages.conf
+++ b/compose/config/drools-applications/env/feature-pooling-messages.conf
@@ -15,4 +15,4 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-POOLING_TOPIC=pooling
+POOLING_TOPIC=policy-pdp-pooling
diff --git a/compose/config/drools-pdp/env/base.conf b/compose/config/drools-pdp/env/base.conf
index a0b2a923..0e0156bd 100644
--- a/compose/config/drools-pdp/env/base.conf
+++ b/compose/config/drools-pdp/env/base.conf
@@ -102,6 +102,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
 # kafka server
 
 KAFKA_SERVERS=kafka:9092
+KAFKA_HTTPS=false
 
 # AAI
 
diff --git a/compose/docker-compose.gui.yml b/compose/docker-compose.gui.yml
index 326ce217..e2e98b54 100644
--- a/compose/docker-compose.gui.yml
+++ b/compose/docker-compose.gui.yml
@@ -1,6 +1,6 @@
 #
 # ===========LICENSE_START====================================================
-#  Copyright 2023 Nordix Foundation.
+#  Copyright 2023-2024 Nordix Foundation.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,45 +15,45 @@
 # limitations under the License.
 # ============LICENSE_END=====================================================
 #
-version: '2'
+
 services:
-   policy-gui:
-     image: ${CONTAINER_LOCATION}onap/policy-gui:latest
-     container_name: policy-gui
-     depends_on:
+  policy-gui:
+    image: ${CONTAINER_LOCATION}onap/policy-gui:latest
+    container_name: policy-gui
+    depends_on:
       - policy-clamp-backend
-     hostname: policy-gui
-     environment:
-       CLAMP_URL: http://policy-clamp-backend:8445
-       CLAMP_DISABLE_SSL_VALIDATION: "true"
-     ports:
+    hostname: policy-gui
+    environment:
+      CLAMP_URL: http://policy-clamp-backend:8445
+      CLAMP_DISABLE_SSL_VALIDATION: "true"
+    ports:
       - "2445:2445"
-     volumes:
+    volumes:
       - ./config/policy-gui/application.yaml:/opt/app/policy/gui/etc/application.yml
       - ./config/policy-gui/logback.xml:/opt/app/policy/gui/etc/logback.xml:ro
       - ./wait_for_port.sh:/opt/app/policy/gui/bin/wait_for_port.sh:ro
-     entrypoint: ./policy-gui.sh
-     working_dir: /opt/app/policy/gui/bin
-     command: ./policy-gui.sh
-   policy-clamp-backend:
-     image: ${CONTAINER_LOCATION}onap/policy-clamp-backend:latest
-     container_name: policy-clamp-backend
-     depends_on:
+    entrypoint: ./policy-gui.sh
+    working_dir: /opt/app/policy/gui/bin
+    command: ./policy-gui.sh
+  policy-clamp-backend:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-backend:latest
+    container_name: policy-clamp-backend
+    depends_on:
       - policy-clamp-runtime-acm
       - distribution
-     hostname: policy-clamp-backend
-     environment:
-        POLICY_API_HOST: api
-        POLICY_PAP_HOST: pap
-        MARIADB_HOST: mariadb
-        RUNTIME_HOST: policy-clamp-runtime-acm
-     ports:
+    hostname: policy-clamp-backend
+    environment:
+      POLICY_API_HOST: api
+      POLICY_PAP_HOST: pap
+      MARIADB_HOST: mariadb
+      RUNTIME_HOST: policy-clamp-runtime-acm
+    ports:
       - "8445:8445"
-     volumes:
+    volumes:
       - ./config/clamp/ClampBackend.properties:/opt/policy/clamp/config/ClampBackend.properties:ro
       - ./config/clamp/logback-backend.xml:/opt/policy/clamp/config/logback.xml:ro
-     working_dir: /opt/policy/clamp
-     command: java
+    working_dir: /opt/policy/clamp
+    command: java
       -Djava.security.egd=file:/dev/./urandom
       -XX:MinRAMPercentage=50
       -XX:MaxRAMPercentage=75
diff --git a/compose/docker-compose.pdp.scale.yml b/compose/docker-compose.pdp.scale.yml
index 104de3c6..a10264a5 100644
--- a/compose/docker-compose.pdp.scale.yml
+++ b/compose/docker-compose.pdp.scale.yml
@@ -1,6 +1,6 @@
 #
 # ===========LICENSE_START====================================================
-#  Copyright (C) 2023 Nordix Foundation.
+#  Copyright (C) 2023-2024 Nordix Foundation.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 # ============LICENSE_END=====================================================
 #
 
-version: '2'
 services:
   apexpdp:
     image: ${CONTAINER_LOCATION}onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
@@ -30,8 +29,8 @@ services:
       - 6969
       - 23324
     deploy:
-        mode: replicated
-        replicas: ${REPLICAS}
+      mode: replicated
+      replicas: ${REPLICAS}
     volumes:
       - ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro
       - ./config/apex-pdp/logback.xml:/opt/app/policy/apex-pdp/etc/logback.xml:ro
@@ -42,7 +41,7 @@ services:
       'mariadb', '3306',
       'kafka', '9092',
       'pap', '6969'
-      ]
+    ]
   nginx:
     image: ${CONTAINER_LOCATION}library/nginx:latest
     volumes:
@@ -50,8 +49,7 @@ services:
     depends_on:
       - apexpdp
     ports:
-       - ${APEX_PORT}:${APEX_PORT}
-
+      - ${APEX_PORT}:${APEX_PORT}
   zookeeper:
     image: confluentinc/cp-zookeeper:latest
     environment:
@@ -59,7 +57,6 @@ services:
       ZOOKEEPER_TICK_TIME: 2000
     ports:
       - 2181:2181
-
   kafka:
     image: confluentinc/cp-kafka:latest
     container_name: kafka
diff --git a/compose/docker-compose.postgres.yml b/compose/docker-compose.postgres.yml
index 9c09b663..fee55d97 100644
--- a/compose/docker-compose.postgres.yml
+++ b/compose/docker-compose.postgres.yml
@@ -15,7 +15,7 @@
 # limitations under the License.
 # ============LICENSE_END=====================================================
 #
-version: '2'
+
 services:
   postgres:
     image: nexus3.onap.org:10001/library/postgres:${POLICY_POSTGRES_VER}
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index d5c6c3b2..06a24497 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -17,421 +17,431 @@
 # limitations under the License.
 # ============LICENSE_END=====================================================
 #
-version: '2'
-services:
-   mariadb:
-      image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
-      container_name: mariadb
-      hostname: mariadb
-      command: ['--lower-case-table-names=1', '--wait_timeout=28800', '--default-authentication-plugin=mysql_native_password']
-      env_file: ./config/db/db.conf
-      volumes:
-         - ./config/db:/docker-entrypoint-initdb.d:ro
-         - ./config/clamp/policy-clamp-create-tables.sql:/tmp/policy-clamp-create-tables.sql
-      ports:
-       - "3306:3306"
-   policy-db-migrator:
-      image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
-      container_name: policy-db-migrator
-      hostname: policy-db-migrator
-      depends_on:
-       - mariadb
-      expose:
-       - 6824
-      env_file: ./config/db/db.conf
-      environment:
-        SQL_DB: policyadmin
-        SQL_HOST: mariadb
-      volumes:
-         - ./config/db-migrator/init.sh:/opt/app/policy/bin/db_migrator_policy_init.sh:ro
-         - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-              '-c',
-                '/opt/app/policy/bin/db_migrator_policy_init.sh',
-                'mariadb', '3306'
-               ]
-   policy-db-migrator-clamp:
-     image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
-     container_name: policy-db-migrator-clamp
-     hostname: policy-db-migrator-clamp
-     depends_on:
-       - mariadb
-     expose:
-       - 6824
-     env_file: ./config/db/db.conf
-     environment:
-       SQL_DB: clampacm
-       SQL_HOST: mariadb
-     volumes:
-       - ./config/db-migrator/init.sh:/opt/app/policy/bin/db_migrator_policy_init.sh:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-     entrypoint: /opt/app/policy/bin/wait_for_port.sh
-     command: [
-       '-c',
-       '/opt/app/policy/bin/db_migrator_policy_init.sh',
-       'mariadb', '3306'
-     ]
-   simulator:
-      image: ${CONTAINER_LOCATION}onap/policy-models-simulator:${POLICY_MODELS_VERSION}
-      container_name: simulator
-      hostname: simulator
-      networks:
-          default:
-              aliases:
-                  - aai-sim
-                  - grpc-sim
-                  - sdnc-sim
-                  - so-sim
-                  - vfc-sim
-      volumes:
-       - ./config/sim-all:/opt/app/policy/simulators/etc/mounted:ro
-       - ./config/sim-all/logback.xml:/opt/app/policy/simulators/etc/mounted/logback.xml:ro
-      expose:
-       - 6666
-       - 6668
-       - 6669
-       - 6670
-       - 6680
-      ports:
-       - ${SIMULATOR_PORT}:6666
-   api:
-      image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
-      container_name: policy-api
-      depends_on:
-       - policy-db-migrator
-      hostname: policy-api
-      ports:
-       - ${API_PORT}:6969
-      volumes:
-       - ./config/api/apiParameters.yaml:/opt/app/policy/api/etc/apiParameters.yaml:ro
-       - ./config/api/logback.xml:/opt/app/policy/api/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
-      entrypoint: ./wait_for_port.sh
-      command: [
-        '-c', './policy-api.sh',
-        'mariadb', '3306',
-        'policy-db-migrator', '6824'
-        ]
-   pap:
-      image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION}
-      container_name: policy-pap
-      depends_on:
-       - mariadb
-       - kafka
-       - api
-      hostname: policy-pap
-      ports:
-       - ${PAP_PORT}:6969
-      volumes:
-       - ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro
-       - ./config/${PROJECT}/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro
-       - ./config/pap/logback.xml:/opt/app/policy/pap/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro
-      entrypoint: ./wait_for_port.sh
-      command: [
-        '-c', './policy-pap.sh',
-        'mariadb', '3306',
-        'kafka', '9092',
-        'api', '6969'
-        ]
-   xacml-pdp:
-      image: ${CONTAINER_LOCATION}onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
-      container_name: policy-xacml-pdp
-      depends_on:
-       - mariadb
-       - kafka
-       - pap
-      hostname: policy-xacml-pdp
-      ports:
-       - ${XACML_PORT}:6969
-       - "30999:3904"
-      volumes:
-       - ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro
-       - ./config/xacml-pdp/logback.xml:/opt/app/policy/pdpx/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/pdpx/bin/wait_for_port.sh:ro
-      entrypoint: ./wait_for_port.sh
-      command: [
-        '-c', './policy-pdpx.sh',
-        'mariadb', '3306',
-        'kafka', '9092',
-        'pap', '6969'
-        ]
-   drools-pdp:
-      image: ${CONTAINER_LOCATION}onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
-      container_name: drools
-      depends_on:
-       - mariadb
-       - kafka
-       - pap
-      hostname: drools
-      ports:
-       - ${DROOLS_PORT}:6969
-       - ${DROOLS_TELEMETRY_PORT}:9696
-      volumes:
-       - ./config/drools-pdp/custom:/tmp/policy-install/config:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      env_file:
-        - ./config/drools-pdp/env/base.conf
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', '/opt/app/policy/bin/pdpd-entrypoint.sh boot',
-        'mariadb', '3306',
-        'kafka', '9092'
-        ]
-   drools-applications:
-      image: ${CONTAINER_LOCATION}onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
-      container_name: drools-apps
-      depends_on:
-       - mariadb
-       - simulator
-       - kafka
-       - pap
-       - xacml-pdp
-      hostname: drools-apps
-      ports:
-       - ${DROOLS_APPS_PORT}:6969
-       - ${DROOLS_APPS_TELEMETRY_PORT}:9696
-      volumes:
-       - ./config/drools-applications/custom:/tmp/policy-install/config:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      env_file:
-        - ./config/drools-applications/env/base.conf
-        - ./config/drools-applications/env/feature-healthcheck.conf
-        - ./config/drools-applications/env/feature-pooling-messages.conf
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
-        'mariadb', '3306',
-        'kafka', '9092',
-        'pap', '6969',
-        'aai-sim', '6666',
-        'sdnc-sim', '6668',
-        'so-sim', '6669',
-        'vfc-sim', '6670'
-        ]
-   apex-pdp:
-      image: ${CONTAINER_LOCATION}onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
-      container_name: policy-apex-pdp
-      depends_on:
-       - mariadb
-       - simulator
-       - kafka
-       - pap
-      hostname: policy-apex-pdp
-      ports:
-       - ${APEX_PORT}:6969
-       - ${APEX_EVENTS_PORT}:23324
-      volumes:
-       - ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro
-       - ./config/apex-pdp/logback.xml:/opt/app/policy/apex-pdp/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json',
-        'mariadb', '3306',
-        'kafka', '9092',
-        'pap', '6969'
-        ]
-   distribution:
-      image: ${CONTAINER_LOCATION}onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
-      container_name: policy-distribution
-      depends_on:
-       - mariadb
-       - api
-       - pap
-       - apex-pdp
-      hostname: policy-distribution
-      ports:
-       - ${DIST_PORT}:6969
-      volumes:
-       - ./config/distribution/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json:ro
-       - /tmp/distribution/:/opt/app/policy/distribution/etc/temp/:ro
-       - ./config/distribution/logback.xml:/opt/app/policy/distribution/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './policy-dist.sh',
-        'mariadb', '3306',
-        'kafka', '9092',
-        'pap', '6969',
-        'apex-pdp', '6969'
-        ]
-   policy-clamp-runtime-acm:
-      image: ${CONTAINER_LOCATION}onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
-      container_name: policy-clamp-runtime-acm
-      depends_on:
-       - policy-db-migrator-clamp
-       - kafka
-       - policy-clamp-ac-http-ppnt
-       - policy-clamp-ac-k8s-ppnt
-       - policy-clamp-ac-pf-ppnt
-       - policy-clamp-ac-sim-ppnt
-       - apex-pdp
-      hostname: policy-clamp-runtime-acm
-      ports:
-       - ${ACM_PORT}:6969
-      volumes:
-       - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml
-       - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './acm-runtime.sh',
-        'mariadb', '3306',
-        'kafka', '9092',
-        'policy-clamp-ac-http-ppnt', '6969',
-        'policy-clamp-ac-k8s-ppnt', '6969',
-        'policy-clamp-ac-pf-ppnt', '6969',
-        'apex-pdp', '6969'
-        ]
-
-   policy-clamp-ac-http-ppnt:
-      image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_PPNT_VERSION}
-      container_name: policy-clamp-ac-http-ppnt
-      depends_on:
-       - kafka
-      hostname: policy-clamp-ac-http-ppnt
-      ports:
-       - "30290:6969"
-      volumes:
-       - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml
-       - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './http-participant.sh',
-        'kafka', '9092'
-        ]
-   policy-clamp-ac-k8s-ppnt:
-      image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-k8s-ppnt:${POLICY_CLAMP_PPNT_VERSION}
-      container_name: policy-clamp-ac-k8s-ppnt
-      depends_on:
-       - kafka
-      hostname: policy-clamp-ac-k8s-ppnt
-      ports:
-       - "30295:6969"
-      volumes:
-       - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml
-       - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './kubernetes-participant.sh',
-        'kafka', '9092'
-        ]
-   policy-clamp-ac-pf-ppnt:
-      image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-pf-ppnt:${POLICY_CLAMP_PPNT_VERSION}
-      container_name: policy-clamp-ac-pf-ppnt
-      depends_on:
-       - kafka
-       - api
-      hostname: policy-clamp-ac-pf-ppnt
-      ports:
-       - ${POLICY_PARTICIPANT_PORT}:6969
-      volumes:
-       - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro
-       - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './policy-participant.sh',
-        'kafka', '9092',
-        'api', '6969'
-        ]
-   policy-clamp-ac-a1pms-ppnt:
-      image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-a1pms-ppnt:${POLICY_CLAMP_PPNT_VERSION}
-      container_name: policy-clamp-ac-a1pms-ppnt
-      depends_on:
-       - kafka
-      hostname: policy-clamp-ac-a1pms-ppnt
-      ports:
-       - "30296:6969"
-      volumes:
-       - ./config/clamp/A1pmsParticipantParameters.yaml:/opt/app/policy/clamp/etc/A1pmsParticipantParameters.yaml:ro
-       - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './a1pms-participant.sh',
-        'kafka', '9092'
-        ]
-   policy-clamp-ac-kserve-ppnt:
-      image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-kserve-ppnt:${POLICY_CLAMP_PPNT_VERSION}
-      container_name: policy-clamp-ac-kserve-ppnt
-      depends_on:
-       - kafka
-      hostname: policy-clamp-ac-kserve-ppnt
-      ports:
-       - "30297:6969"
-      volumes:
-       - ./config/clamp/KserveParticipantParameters.yaml:/opt/app/policy/clamp/etc/KserveParticipantParameters.yaml:ro
-       - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
-       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './kserve-participant.sh',
-        'kafka', '9092'
-        ]
-   policy-clamp-ac-sim-ppnt:
-      image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-sim-ppnt:${POLICY_CLAMP_VERSION}
-      container_name: policy-clamp-ac-sim-ppnt
-      depends_on:
-        - kafka
-      hostname: policy-clamp-ac-sim-ppnt
-      ports:
-        - ${SIM_PARTICIPANT_PORT}:6969
-      volumes:
-        - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro
-        - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
-        - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-        '-c', './sim-participant.sh',
-        'kafka', '9092'
-      ]
-   prometheus:
-      image: nexus3.onap.org:10001/prom/prometheus:latest
-      container_name: prometheus
-      hostname: prometheus
-      ports:
-       - ${PROMETHEUS_PORT}:9090
-      volumes:
-       - ./metrics/prometheus.yml:/etc/prometheus/prometheus.yml
-   grafana:
-      image: nexus3.onap.org:10001/grafana/grafana:latest
-      container_name: grafana
-      depends_on:
-       - prometheus
-      hostname: grafana
-      ports:
-       - ${GRAFANA_PORT}:3000
-      volumes:
-       - ./metrics/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
-       - ./metrics/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
-       - ./metrics/dashboards:/var/lib/grafana/dashboards
 
-   zookeeper:
-     image: confluentinc/cp-zookeeper:latest
-     container_name: zookeeper
-     environment:
-       ZOOKEEPER_CLIENT_PORT: 2181
-       ZOOKEEPER_TICK_TIME: 2000
-     ports:
-       - "2181:2181"
+services:
+  mariadb:
+    image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
+    container_name: mariadb
+    hostname: mariadb
+    command: [ '--lower-case-table-names=1', '--wait_timeout=28800', '--default-authentication-plugin=mysql_native_password' ]
+    env_file: ./config/db/db.conf
+    volumes:
+      - ./config/db:/docker-entrypoint-initdb.d:ro
+      - ./config/clamp/policy-clamp-create-tables.sql:/tmp/policy-clamp-create-tables.sql
+    ports:
+      - "3306:3306"
+  policy-db-migrator:
+    image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
+    container_name: policy-db-migrator
+    hostname: policy-db-migrator
+    depends_on:
+      - mariadb
+    expose:
+      - 6824
+    env_file: ./config/db/db.conf
+    environment:
+      SQL_DB: policyadmin
+      SQL_HOST: mariadb
+    volumes:
+      - ./config/db-migrator/init.sh:/opt/app/policy/bin/db_migrator_policy_init.sh:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c',
+      '/opt/app/policy/bin/db_migrator_policy_init.sh',
+      'mariadb', '3306'
+    ]
+  policy-db-migrator-clamp:
+    image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
+    container_name: policy-db-migrator-clamp
+    hostname: policy-db-migrator-clamp
+    depends_on:
+      - mariadb
+    expose:
+      - 6824
+    env_file: ./config/db/db.conf
+    environment:
+      SQL_DB: clampacm
+      SQL_HOST: mariadb
+    volumes:
+      - ./config/db-migrator/init.sh:/opt/app/policy/bin/db_migrator_policy_init.sh:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c',
+      '/opt/app/policy/bin/db_migrator_policy_init.sh',
+      'mariadb', '3306'
+    ]
+  simulator:
+    image: ${CONTAINER_LOCATION}onap/policy-models-simulator:${POLICY_MODELS_VERSION}
+    container_name: simulator
+    hostname: simulator
+    networks:
+      default:
+        aliases:
+          - aai-sim
+          - grpc-sim
+          - sdnc-sim
+          - so-sim
+          - vfc-sim
+    volumes:
+      - ./config/sim-all:/opt/app/policy/simulators/etc/mounted:ro
+      - ./config/sim-all/logback.xml:/opt/app/policy/simulators/etc/mounted/logback.xml:ro
+    expose:
+      - 6666
+      - 6668
+      - 6669
+      - 6670
+      - 6680
+    ports:
+      - ${SIMULATOR_PORT}:6666
+  api:
+    image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
+    container_name: policy-api
+    hostname: policy-api
+    depends_on:
+      - policy-db-migrator
+    ports:
+      - ${API_PORT}:6969
+    volumes:
+      - ./config/api/apiParameters.yaml:/opt/app/policy/api/etc/apiParameters.yaml:ro
+      - ./config/api/logback.xml:/opt/app/policy/api/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
+    entrypoint: ./wait_for_port.sh
+    command: [
+      '-c', './policy-api.sh',
+      'mariadb', '3306',
+      'policy-db-migrator', '6824'
+    ]
+  pap:
+    image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION}
+    container_name: policy-pap
+    hostname: policy-pap
+    depends_on:
+      - mariadb
+      - kafka
+      - api
+    ports:
+      - ${PAP_PORT}:6969
+    volumes:
+      - ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro
+      - ./config/${PROJECT}/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro
+      - ./config/pap/logback.xml:/opt/app/policy/pap/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro
+    entrypoint: ./wait_for_port.sh
+    command: [
+      '-c', './policy-pap.sh',
+      'mariadb', '3306',
+      'kafka', '9092',
+      'api', '6969'
+    ]
+  xacml-pdp:
+    image: ${CONTAINER_LOCATION}onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
+    container_name: policy-xacml-pdp
+    hostname: policy-xacml-pdp
+    depends_on:
+      - mariadb
+      - kafka
+      - pap
+    ports:
+      - ${XACML_PORT}:6969
+      - "30999:3904"
+    volumes:
+      - ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro
+      - ./config/xacml-pdp/logback.xml:/opt/app/policy/pdpx/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/pdpx/bin/wait_for_port.sh:ro
+    entrypoint: ./wait_for_port.sh
+    command: [
+      '-c', './policy-pdpx.sh',
+      'mariadb', '3306',
+      'kafka', '9092',
+      'pap', '6969'
+    ]
+  drools-pdp:
+    image: ${CONTAINER_LOCATION}onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
+    container_name: policy-drools-pdp
+    hostname: policy-drools-pdp
+    depends_on:
+      - mariadb
+      - kafka
+      - pap
+    ports:
+      - ${DROOLS_PORT}:6969
+      - ${DROOLS_TELEMETRY_PORT}:9696
+    volumes:
+      - ./config/drools-pdp/custom:/tmp/policy-install/config:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    env_file:
+      - ./config/drools-pdp/env/base.conf
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', '/opt/app/policy/bin/pdpd-entrypoint.sh boot',
+      'mariadb', '3306',
+      'kafka', '9092'
+    ]
+  drools-applications:
+    image: ${CONTAINER_LOCATION}onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
+    container_name: policy-drools-apps
+    hostname: policy-drools-apps
+    depends_on:
+      - mariadb
+      - simulator
+      - kafka
+      - pap
+      - xacml-pdp
+    ports:
+      - ${DROOLS_APPS_PORT}:6969
+      - ${DROOLS_APPS_TELEMETRY_PORT}:9696
+    volumes:
+      - ./config/drools-applications/custom:/tmp/policy-install/config:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    env_file:
+      - ./config/drools-applications/env/base.conf
+      - ./config/drools-applications/env/feature-healthcheck.conf
+      - ./config/drools-applications/env/feature-pooling-messages.conf
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
+      'mariadb', '3306',
+      'kafka', '9092',
+      'pap', '6969',
+      'aai-sim', '6666',
+      'sdnc-sim', '6668',
+      'so-sim', '6669',
+      'vfc-sim', '6670'
+    ]
+  apex-pdp:
+    image: ${CONTAINER_LOCATION}onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
+    container_name: policy-apex-pdp
+    hostname: policy-apex-pdp
+    depends_on:
+      - mariadb
+      - simulator
+      - kafka
+      - pap
+    ports:
+      - ${APEX_PORT}:6969
+      - ${APEX_EVENTS_PORT}:23324
+    volumes:
+      - ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro
+      - ./config/apex-pdp/logback.xml:/opt/app/policy/apex-pdp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json',
+      'mariadb', '3306',
+      'kafka', '9092',
+      'pap', '6969'
+    ]
+  distribution:
+    image: ${CONTAINER_LOCATION}onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
+    container_name: policy-distribution
+    hostname: policy-distribution
+    depends_on:
+      - mariadb
+      - api
+      - pap
+      - apex-pdp
+    ports:
+      - ${DIST_PORT}:6969
+    volumes:
+      - ./config/distribution/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json:ro
+      - /tmp/distribution/:/opt/app/policy/distribution/etc/temp/:ro
+      - ./config/distribution/logback.xml:/opt/app/policy/distribution/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './policy-dist.sh',
+      'mariadb', '3306',
+      'kafka', '9092',
+      'pap', '6969',
+      'apex-pdp', '6969'
+    ]
+  policy-clamp-runtime-acm:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
+    container_name: policy-clamp-runtime-acm
+    hostname: policy-clamp-runtime-acm
+    depends_on:
+      - policy-db-migrator-clamp
+      - kafka
+      - policy-clamp-ac-http-ppnt
+      - policy-clamp-ac-k8s-ppnt
+      - policy-clamp-ac-pf-ppnt
+      - policy-clamp-ac-sim-ppnt
+      - apex-pdp
+    ports:
+      - ${ACM_PORT}:6969
+    volumes:
+      - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml
+      - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './acm-runtime.sh',
+      'mariadb', '3306',
+      'kafka', '9092',
+      'policy-clamp-ac-http-ppnt', '6969',
+      'policy-clamp-ac-k8s-ppnt', '6969',
+      'policy-clamp-ac-pf-ppnt', '6969',
+      'apex-pdp', '6969'
+    ]
 
-   kafka:
-     image: confluentinc/cp-kafka:latest
-     container_name: kafka
-     depends_on:
-       - zookeeper
-     ports:
-       - "29092:29092"
-       - "9092:9092"
-     environment:
-       KAFKA_BROKER_ID: 1
-       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
-       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
\ No newline at end of file
+  policy-clamp-ac-http-ppnt:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_PPNT_VERSION}
+    container_name: policy-clamp-ac-http-ppnt
+    hostname: policy-clamp-ac-http-ppnt
+    depends_on:
+      - kafka
+    ports:
+      - "30290:6969"
+    volumes:
+      - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml
+      - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './http-participant.sh',
+      'kafka', '9092'
+    ]
+  policy-clamp-ac-k8s-ppnt:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-k8s-ppnt:${POLICY_CLAMP_PPNT_VERSION}
+    container_name: policy-clamp-ac-k8s-ppnt
+    hostname: policy-clamp-ac-k8s-ppnt
+    depends_on:
+      - kafka
+    ports:
+      - "30295:6969"
+    volumes:
+      - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml
+      - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './kubernetes-participant.sh',
+      'kafka', '9092'
+    ]
+  policy-clamp-ac-pf-ppnt:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-pf-ppnt:${POLICY_CLAMP_PPNT_VERSION}
+    container_name: policy-clamp-ac-pf-ppnt
+    hostname: policy-clamp-ac-pf-ppnt
+    depends_on:
+      - kafka
+      - api
+    ports:
+      - ${POLICY_PARTICIPANT_PORT}:6969
+    volumes:
+      - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro
+      - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './policy-participant.sh',
+      'kafka', '9092',
+      'api', '6969'
+    ]
+  policy-clamp-ac-a1pms-ppnt:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-a1pms-ppnt:${POLICY_CLAMP_PPNT_VERSION}
+    container_name: policy-clamp-ac-a1pms-ppnt
+    hostname: policy-clamp-ac-a1pms-ppnt
+    depends_on:
+      - kafka
+    ports:
+      - "30296:6969"
+    volumes:
+      - ./config/clamp/A1pmsParticipantParameters.yaml:/opt/app/policy/clamp/etc/A1pmsParticipantParameters.yaml:ro
+      - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './a1pms-participant.sh',
+      'kafka', '9092'
+    ]
+  policy-clamp-ac-kserve-ppnt:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-kserve-ppnt:${POLICY_CLAMP_PPNT_VERSION}
+    container_name: policy-clamp-ac-kserve-ppnt
+    hostname: policy-clamp-ac-kserve-ppnt
+    depends_on:
+      - kafka
+    ports:
+      - "30297:6969"
+    volumes:
+      - ./config/clamp/KserveParticipantParameters.yaml:/opt/app/policy/clamp/etc/KserveParticipantParameters.yaml:ro
+      - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './kserve-participant.sh',
+      'kafka', '9092'
+    ]
+  policy-clamp-ac-sim-ppnt:
+    image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-sim-ppnt:${POLICY_CLAMP_VERSION}
+    container_name: policy-clamp-ac-sim-ppnt
+    hostname: policy-clamp-ac-sim-ppnt
+    depends_on:
+      - kafka
+    ports:
+      - ${SIM_PARTICIPANT_PORT}:6969
+    volumes:
+      - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro
+      - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro
+      - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+      '-c', './sim-participant.sh',
+      'kafka', '9092'
+    ]
+  prometheus:
+    image: nexus3.onap.org:10001/prom/prometheus:latest
+    container_name: prometheus
+    hostname: prometheus
+    ports:
+      - ${PROMETHEUS_PORT}:9090
+    volumes:
+      - ./metrics/prometheus.yml:/etc/prometheus/prometheus.yml
+  grafana:
+    image: nexus3.onap.org:10001/grafana/grafana:latest
+    container_name: grafana
+    hostname: grafana
+    depends_on:
+      - prometheus
+    ports:
+      - ${GRAFANA_PORT}:3000
+    volumes:
+      - ./metrics/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
+      - ./metrics/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
+      - ./metrics/dashboards:/var/lib/grafana/dashboards
+  zookeeper:
+    image: confluentinc/cp-zookeeper:latest
+    container_name: zookeeper
+    hostname: zookeeper
+    ports:
+      - "2181:2181"
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+  kafka:
+    image: confluentinc/cp-kafka:latest
+    container_name: kafka
+    hostname: kafka
+    depends_on:
+      - zookeeper
+    ports:
+      - 9092:9092
+      - 29092:29092
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_ADVERTISED_HOST_NAME: kafka
+  csit-tests:
+    image: policy-csit-robot:latest
+    container_name: policy-csit
+    hostname: policy-csit
+    volumes:
+      - ${ROBOT_LOG_DIR}:/tmp/results
+      - /tmp/distribution:/tmp/distribution
+    environment:
+      ROBOT_FILE: ${ROBOT_FILES}
+      CLAMP_K8S_TEST: false
diff --git a/compose/start-compose.sh b/compose/start-compose.sh
index 49006f11..a5da09d8 100755
--- a/compose/start-compose.sh
+++ b/compose/start-compose.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # ============LICENSE_START====================================================
-#  Copyright (C) 2022-2023 Nordix Foundation.
+#  Copyright (C) 2022-2024 Nordix Foundation.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@ do
       break;
       ;;
     *)
-      echo "$1"
       component="$1"
       shift
       ;;
@@ -68,32 +67,37 @@ if [ -z "$PROJECT" ]; then
   export PROJECT=$component
 fi
 
+# docker compose fails when not running CSIT
+if [ -z "$ROBOT_LOG_DIR" ]; then
+  export ROBOT_LOG_DIR=/tmp/
+fi
+
 if [ -n "$component" ]; then
   if [ "$component" == "logs" ]; then
   echo "Collecting logs..."
-    docker-compose logs > docker-compose.log
+    docker compose logs > docker-compose.log
   elif [ "$grafana" = true ]; then
     echo "Starting ${component} application with Grafana"
-    docker-compose up -d "${component}" grafana
+    docker compose up -d "${component}" grafana
     echo "Prometheus server: http://localhost:${PROMETHEUS_PORT}"
     echo "Grafana server: http://localhost:${GRAFANA_PORT}"
   elif [ "$gui" = true ]; then
     echo "Starting application with gui..."
-    docker-compose -f docker-compose.yml -f docker-compose.gui.yml up -d "${component}" policy-gui
+    docker compose -f docker-compose.yml -f docker-compose.gui.yml up -d "${component}" policy-gui
     echo "Clamp GUI: https://localhost:2445/clamp"
   else
     echo "Starting ${component} application"
-    docker-compose up -d "${component}"
+    docker compose up -d "${component}"
   fi
 else
   export PROJECT=api # api has groups.json complete with all 3 pdps
   if [ "$gui" = true ]; then
     echo "Starting application with gui..."
-    docker-compose -f docker-compose.yml -f docker-compose.gui.yml up -d
+    docker compose -f docker-compose.yml -f docker-compose.gui.yml up -d
     echo "Clamp GUI: https://localhost:2445/clamp"
   else
     echo "Starting all components..."
-    docker-compose up -d
+    docker compose up -d
   fi
 fi
 
diff --git a/compose/stop-compose.sh b/compose/stop-compose.sh
index 0a7d9af4..013fbe1e 100755
--- a/compose/stop-compose.sh
+++ b/compose/stop-compose.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # ============LICENSE_START====================================================
-#  Copyright (C) 2023 Nordix Foundation.
+#  Copyright (C) 2023-2024 Nordix Foundation.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +23,14 @@ if [ -z "${WORKSPACE}" ]; then
     WORKSPACE=$(git rev-parse --show-toplevel)
     export WORKSPACE
 fi
+
+# docker compose fails when not running CSIT
+if [ -z "$ROBOT_LOG_DIR" ]; then
+  export ROBOT_LOG_DIR=/tmp/
+  export ROBOT_FILES=none
+  export PROJECT=api
+fi
+
 COMPOSE_FOLDER="${WORKSPACE}"/compose
 
 cd ${COMPOSE_FOLDER}
@@ -31,10 +39,24 @@ source export-ports.sh > /dev/null 2>&1
 source get-versions.sh > /dev/null 2>&1
 
 echo "Collecting logs from docker compose containers..."
-docker-compose logs > docker_compose.log
+rm -rf docker_compose.log
+
+# this will collect logs by service instead of mixing all together
+containers=$(docker compose ps --all --format '{{.Service}}')
+
+IFS=$'\n' read -d '' -r -a item_list <<< "$containers"
+for item in "${item_list[@]}"
+do
+    if [ -n "$item" ]; then
+        echo "======== Logs from ${item} ========" >> docker_compose.log
+        docker compose logs $item >> docker_compose.log
+        echo "===================================" >> docker_compose.log
+    fi
+done
+
 cat docker_compose.log
 
 echo "Tearing down containers..."
-docker-compose down -v --remove-orphans
+docker compose down -v --remove-orphans
 
 cd ${WORKSPACE}