From 9df4a57a05e3ee67ff96284a4f7b1b07c94600b1 Mon Sep 17 00:00:00 2001 From: ToineSiebelink Date: Thu, 16 Jan 2025 14:41:18 +0000 Subject: One SchemaSet per moduleSetTag - Registration: create and upgrade cases. - Handle moduleSetTag deletion (all orphans) for testware - Unit tests updated - additional logging of details for upgrade scenarios - Integration Tests updated - Remove cache for module sets being processed - Removed DbCleaner (startup) - Removed redundant methods in NCMP Inventory for deleting schema set(s) - Removed validation check for all schema set interactions - Updated some schema set tests to use special characters previously not allowed - Checked integration test scenarios for upgrades with and without tags: all scenarios covered! TODO - REST endpoint to remove orphaned schema set data, separate story: CPS-2554 - Investigate exception handling regarding DuplicateYangResourceException: CPS-2555 Issue-ID: CPS-2540 Signed-off-by: ToineSiebelink Change-Id: Iaa59cbdb86b7a4a8044624829bc002506ff40cc7 --- docker-compose/docker-compose.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'docker-compose/docker-compose.yml') diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 1e3b9ab96f..bcb2c2b88c 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (c) 2020 Pantheon.tech. # Modifications Copyright (C) 2021 Bell Canada. -# Modifications Copyright (C) 2022-2024 Nordix Foundation. +# Modifications Copyright (C) 2022-2025 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -51,6 +51,8 @@ services: image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${CPS_VERSION:-latest} ports: - ${CPS_PORT_RANGE:-8698-8699}:8080 + ### DEBUG: Uncomment next line to enable java debugging (ensure 'ports' aligns with 'deploy') + ### - ${CPS_CORE_DEBUG_PORT:-5005}:5005- environment: CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} @@ -66,9 +68,9 @@ services: ONAP_OTEL_EXPORTER_ENDPOINT: http://jaeger-service:4317 POLICY_SERVICE_ENABLED: 'false' POLICY_SERVICE_DEFAULT_DECISION: 'deny from env' - JAVA_TOOL_OPTIONS: "-XX:InitialRAMPercentage=75.0 -XX:MaxRAMPercentage=75.0" + ####JAVA_TOOL_OPTIONS: "-XX:InitialRAMPercentage=75.0 -XX:MaxRAMPercentage=75.0" ### DEBUG: Uncomment next line to enable java debugging - ### DEBUG: JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 + ### JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 restart: unless-stopped depends_on: - dbpostgresql @@ -79,9 +81,6 @@ services: limits: cpus: '3' memory: 2G - ### DEBUG: Uncomment next 2 lines to enable java debugging (ensure 'ports' aligns with 'deploy') - ### DEBUG ports: - ### DEBUG - ${CPS_CORE_DEBUG_PORT:-5005}:5005 nginx: container_name: ${NGINX_CONTAINER_NAME:-nginx-loadbalancer} -- cgit 1.2.3-korg