From: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Date: Fri, 7 May 2021 13:27:49 +0000 (+0000)
Subject: Merge "Update ccsdk-dgbuilder version"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9c427fa03e27e735ea5ba3c8c5d47cdb521235eb;hp=43013b5cc0884eba53da84d325a7bcda09db6231;p=integration%2Fcsit.git

Merge "Update ccsdk-dgbuilder version"
---

diff --git a/plans/so/macroflow/docker-compose.local.yml b/plans/so/macroflow/docker-compose.local.yml
index 281a5162..a796b379 100644
--- a/plans/so/macroflow/docker-compose.local.yml
+++ b/plans/so/macroflow/docker-compose.local.yml
@@ -25,6 +25,3 @@ services:
   api-handler-infra:
     image: onap/so/api-handler-infra:${TAG}
 #############################################################################
-  so-monitoring:
-    image: onap/so/so-monitoring:${TAG}
-################################################################################
diff --git a/plans/so/macroflow/docker-compose.yml b/plans/so/macroflow/docker-compose.yml
index 8cc1c7b6..5b6bfb23 100644
--- a/plans/so/macroflow/docker-compose.yml
+++ b/plans/so/macroflow/docker-compose.yml
@@ -227,22 +227,6 @@ services:
     user: root
     entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 #############################################################################
-  so-monitoring:
-    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG}
-    ports:
-      - "30224:30224"
-    volumes:
-      - ${CONFIG_DIR_PATH_MACRO}/override-files/so-monitoring/onapheat:/app/config
-    environment:
-      - APP=so-monitoring
-      - JVM_ARGS=-Xms64m -Xmx512m
-    hostname:
-      so-monitoring.so.testlab.onap.org
-    depends_on:
-      - mariadb
-      - catalog-db-adapter
-      - request-db-adapter
-################################################################################
   sdc-simulator:
     image: simulators/sdc-simulator:latest
     ports: