Merge "Add dfc log to console"

[integration/csit.git] / plans / so / integration-etsi-testing / docker-compose.yml

diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index 69fb685..ae20b0d 100644 (file)
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -130,7 +130,7 @@ services:
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
       - ${TEST_LAB_DIR}/volumes/so/config/sdc-controller/onapheat:/app/config
-      - ${CONFIG_DIR_PATH}/distribution-test-zip/distributionTestZip.zip:/distribution-test-zip/distributionTestZip.zip
+      - ${CONFIG_DIR_PATH}/distribution-test-zip/zipped_sdc_csar.tar.gz:/distribution-test-zip/zipped_sdc_csar.tar.gz
     environment:
       - APP=sdc-controller
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -154,7 +154,7 @@ services:
     command:
       - /bin/sh
       - -c
-      - 'mkdir -p /distribution-test-zip/unzipped && unzip /distribution-test-zip/distributionTestZip.zip -d /distribution-test-zip/unzipped && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+      - 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   bpmn-infra:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/bpmn-infra:${TAG}
@@ -162,7 +162,8 @@ services:
       - "8081:8081"
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ${TEST_LAB_DIR}/volumes/so/config/bpmn-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/bpmn-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/certificates/aai-certificate/aai.crt:/app/ca-certificates/aai.crt
     environment:
       - APP=bpmn-infra
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -231,9 +232,9 @@ services:
   so-monitoring:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG}
     ports:
-      - "30224:9091"
+      - "30224:30224"
     volumes:
-      - ${TEST_LAB_DIR}/volumes/so/config/api-handler-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/so-monitoring/onapheat:/app/config
     environment:
       - APP=so-monitoring
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -250,7 +251,7 @@ services:
       - "9092:9092"
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ${TEST_LAB_DIR}/volumes/so/config/vnfm-adapter/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/vnfm-adapter/onapheat:/app/config
     environment:
     - APP=vnfm-adapter
     - JVM_ARGS=-Xms64m -Xmx512m