Setup automated tests with two replicas of cps-and-ncmp

- this change for two test suits: CSIT and K6
- increase cps-and-ncmp replicas to 2
- introduce nginx as load-balancer
- set proxies inside nginx for the cps-and-ncmp URI paths
- upgrade hazelcast-spring to 5.3.7

Issue-ID: CPS-2038

Change-Id: If1b6c1e1218af16b24cc061507ea9b25d277d143
Signed-off-by: halil.cakal <halil.cakal@est.tech>

1 files changed, 13 insertions, 5 deletions

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 5620c4c17e..f75915ae04 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -43,11 +43,7 @@ services:
           memory: 3G
 
   cps-and-ncmp:
-    container_name: cps-and-ncmp
     image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${CPS_VERSION:-latest}
-    ports:
-      - ${CPS_CORE_PORT:-8883}:8080
-      # - ${CPS_CORE_DEBUG_PORT:-5005}:5005
     environment:
       CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
       CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
@@ -58,11 +54,11 @@ services:
       DMI_PASSWORD: ${DMI_PASSWORD:-cpsr0cks!}
       KAFKA_BOOTSTRAP_SERVER: kafka:29092
       notification.enabled: 'true'
-      # JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
     restart: unless-stopped
     depends_on:
       - dbpostgresql
     deploy:
+      replicas: 2
       resources:
         reservations:
           cpus: '2'
@@ -71,6 +67,18 @@ services:
           cpus: '3'
           memory: 3G
 
+  nginx:
+    container_name: nginx-loadbalancer
+    image: nginx:latest
+    ports:
+      - ${CPS_CORE_PORT:-8883}:80
+    depends_on:
+      - cps-and-ncmp
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf
+      - ./proxy_params:/etc/nginx/proxy_params
+      - ../csit/nginx-log:/var/log/nginx
+
   ### if kafka is not required comment out zookeeper and kafka ###
   zookeeper:
     image: confluentinc/cp-zookeeper:6.2.1