X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fdocker-compose.yml;h=f1853e0e2e82f06c2d2fd6e33392a1f9cfdebe65;hb=07f0edf35f1ebbbe5642c19ad840fa076d9dff8c;hp=22fc221ac60eccc818d4dbd590cd6d36fe82a1a8;hpb=137509e293ae559e3b5fc0d5454421003e3604b2;p=integration%2Fcsit.git diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml index 22fc221a..f1853e0e 100644 --- a/plans/so/integration-etsi-testing/docker-compose.yml +++ b/plans/so/integration-etsi-testing/docker-compose.yml @@ -6,10 +6,14 @@ services: ports: - "3306:3306" volumes: + - /var/lib/mysql - ${TEST_LAB_DIR}/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d - ${TEST_LAB_DIR}/volumes/mariadb/conf.d:/etc/mysql/conf.d environment: - MYSQL_ROOT_PASSWORD=password + - MYSQL_USER=etsicatalog + - MYSQL_PASSWORD=etsicatalog + - MYSQL_DATABASE=etsicatalog hostname: mariadb.so.testlab.onap.org logging: @@ -24,7 +28,7 @@ services: - "8082:8082" volumes: - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - - ${TEST_LAB_DIR}/volumes/so/config/catalog-db-adapter/onapheat:/app/config + - ${CONFIG_DIR_PATH}/override-files/catalog-db-adapter/onapheat:/app/config environment: - APP=catalog-db-adapter - JVM_ARGS=-Xms64m -Xmx512m @@ -43,14 +47,8 @@ services: options: max-size: "30m" max-file: "5" - command: - - /app/wait-for.sh - - -q - - -t - - "300" - - mariadb:3306 - - -- - - "/app/start-app.sh" + user: root + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"' ################################################################################ request-db-adapter: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/request-db-adapter:${TAG} @@ -78,14 +76,8 @@ services: options: max-size: "30m" max-file: "5" - command: - - /app/wait-for.sh - - -q - - -t - - "300" - - catalog-db-adapter:8082 - - -- - - "/app/start-app.sh" + user: root + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" catalog-db-adapter:8082 -- "/app/start-app.sh"' ################################################################################ sdnc-adapter: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG} @@ -114,14 +106,8 @@ services: options: max-size: "30m" max-file: "5" - command: - - /app/wait-for.sh - - -q - - -t - - "300" - - request-db-adapter:8083 - - -- - - "/app/start-app.sh" + user: root + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' ################################################################################ sdc-controller: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdc-controller:${TAG} @@ -129,8 +115,8 @@ services: - "8085:8085" 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 + - ${CONFIG_DIR_PATH}/override-files/sdc-controller/onapheat:/app/config environment: - APP=sdc-controller - JVM_ARGS=-Xms64m -Xmx512m @@ -151,18 +137,17 @@ services: options: max-size: "30m" max-file: "5" - 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"' + user: root + entrypoint: /bin/sh -c 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && chmod 777 -R /distribution-test-zip/ && /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} ports: - "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/bpmn-infra-certs:/app/bpmn-infra-certs + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - APP=bpmn-infra - JVM_ARGS=-Xms64m -Xmx512m @@ -183,22 +168,16 @@ services: options: max-size: "30m" max-file: "5" - command: - - /app/wait-for.sh - - -q - - -t - - "300" - - request-db-adapter:8083 - - -- - - "/app/start-app.sh" + user: root + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' ################################################################################ api-handler-infra: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG} ports: - "8080:8080" volumes: - - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates - - ${TEST_LAB_DIR}/volumes/so/config/api-handler-infra/onapheat:/app/config + - ${CONFIG_DIR_PATH}/override-files/api-handler-infra/onapheat:/app/config + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - APP=api-handler-infra - JVM_ARGS=-Xms64m -Xmx512m @@ -219,21 +198,15 @@ services: options: max-size: "30m" max-file: "5" - command: - - /app/wait-for.sh - - -q - - -t - - "300" - - request-db-adapter:8083 - - -- - - "/app/start-app.sh" + 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: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 @@ -244,18 +217,19 @@ services: - catalog-db-adapter - request-db-adapter ################################################################################ - vnfm-adapter: + so-vnfm-adapter: image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${TAG} ports: - "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/so-vnfm-adapter/onapheat:/app/config + - ${CONFIG_DIR_PATH}/certificates/so-vnfm-adapter-certs:/app/so-vnfm-adapter-certs + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - - APP=vnfm-adapter + - APP=so-vnfm-adapter - JVM_ARGS=-Xms64m -Xmx512m hostname: - vnfm-adapter-test + so-vnfm-adapter depends_on: - request-db-adapter logging: @@ -263,14 +237,8 @@ services: options: max-size: "30m" max-file: "5" - command: - - /app/wait-for.sh - - -q - - -t - - "300" - - request-db-adapter:8083 - - -- - - "/app/start-app.sh" + user: root + entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"' ################################################################################ sdc-simulator: image: simulators/sdc-simulator:latest @@ -283,7 +251,7 @@ services: sdc-simulator depends_on: - mariadb - - vnfm-adapter + - so-vnfm-adapter logging: driver: "json-file" options: @@ -301,25 +269,28 @@ services: aai-simulator depends_on: - mariadb - - vnfm-adapter + - so-vnfm-adapter logging: driver: "json-file" options: max-size: "30m" max-file: "5" ################################################################################ - vnfm-simulator: - image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-simulator:${TAG} + so-vnfm-simulator: + image: simulators/vnfm-simulator:latest ports: - "9093:9093" + volumes: + - ${CONFIG_DIR_PATH}/override-files/vnfm-simulator/onapheat:/app/config + - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt environment: - APP=VNFM-SIMULATOR - JVM_ARGS=-Xms64m -Xmx512m hostname: - vnfm-simulator + so-vnfm-simulator depends_on: - mariadb - - vnfm-adapter + - so-vnfm-adapter logging: driver: "json-file" options: @@ -339,7 +310,7 @@ services: - CATALOG_DB=catalogdb depends_on: - mariadb - - vnfm-adapter + - so-vnfm-adapter command: - "/config/apply-workarounds.sh" ################################################################################# @@ -354,11 +325,48 @@ services: sdnc-simulator depends_on: - mariadb - - vnfm-adapter + - so-vnfm-adapter logging: driver: "json-file" options: max-size: "30m" max-file: "5" ################################################################################ - + populate-aai-config: + image: jobs/workaround-job-container:latest + ports: + - "9995:9995" + volumes: + - ${CONFIG_DIR_PATH}/populate-aai-simulator.sh:/config/populate-aai-simulator.sh + - ${CONFIG_DIR_PATH}/wait-for.sh:/config/wait-for.sh + - ${CONFIG_DIR_PATH}/aai-simulator-populate-data:/config/aai-simulator-populate-data/ + environment: + - AAI_SIMULATOR_HOST=aai-simulator + - AAI_SIMULATOR_PORT=9993 + - TIMEOUT_IN_SECONDS=300 #5 mins + depends_on: + - aai-simulator + command: + - "/config/populate-aai-simulator.sh" +################################################################################ + modeling-etsicatalog: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION} + ports: + - "8806:8806" + volumes: + - /var/lib/mysql + - ${CONFIG_DIR_PATH}/wait-for.sh:/service/wait-for.sh + environment: + - DB_IP=mariadb + - SDC_ADDR=http://sdc-simulator:9991 + hostname: + modeling-etsicatalog + depends_on: + - mariadb + - sdc-simulator + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + entrypoint: /bin/sh -c '/service/wait-for.sh -t 300 -h mariadb -p 3306 && /service/modeling/etsicatalog/docker/docker-entrypoint.sh'