Merge "Drools-apps CSIT randomly fails deploying policies"

[integration/csit.git] / plans / usecases / 5G-bulkpm / composefile / docker-compose-e2e.yml

diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
index b9085d6..3534055 100644 (file)
--- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
+++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:latest
     container_name: datarouter-prov
     hostname: dmaap-dr-prov
     ports:
@@ -9,9 +9,9 @@ services:
      - "8443:8443"
      - "8080:8080"
     volumes:
-     - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
-     - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
-     - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
+     - ../prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
+     - ../prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
+     - ../prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
     depends_on:
       mariadb_container:
         condition: service_healthy
@@ -20,28 +20,34 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
+    extra_hosts:
+      - "dmaap-dr-node:1.1.1.1"
+      - "dcae-pm-mapper:3.3.3.3"
 
   datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:latest
     container_name: datarouter-node
     hostname: dmaap-dr-node
     ports:
      - "9443:8443"
      - "9090:8080"
     volumes:
-     - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
+     - ../node_data/node.properties:/opt/app/datartr/etc/node.properties
     depends_on:
       datarouter-prov:
         condition: service_healthy
+    extra_hosts:
+      - "dmaap-dr-prov:2.2.2.2"
+      - "dcae-pm-mapper:3.3.3.3"
 
   datarouter-subscriber:
-      image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber
+      image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:latest
       container_name: fileconsumer-node
       hostname: subscriber.com
       ports:
        - "7070:7070"
       volumes:
-       - ./subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
+       - ../subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
 
   mariadb_container:
     image: mariadb:10.2.14
@@ -68,14 +74,26 @@ services:
       - /host/upload:/home/admin
     command: admin:admin:1001
 
+  ves:
+    container_name: vescollector
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.4
+    environment:
+       DMAAPHOST:
+
   dfc:
     container_name: dfc
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
     ports:
       - "8433:8433"
+    extra_hosts:
+      - "dmaap-dr-node:5.5.5.5"
 
-  ves:
-    container_name: vescollector
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest
+  consul:
+    container_name: consul
+    image: nexus3.onap.org:10001/consul:latest
+
+  cbs:
+    container_name: cbs
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
     environment:
-       DMAAPHOST:
+       CONSUL_HOST:
\ No newline at end of file