diff options
| -rw-r--r-- | docker-compose/docker-compose.yml | 2 | ||||
| -rwxr-xr-x | k6-tests/setup.sh | 8 | ||||
| -rwxr-xr-x | k6-tests/teardown.sh | 8 |
3 files changed, 15 insertions, 3 deletions
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 274799679f..cc01c1b645 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -79,7 +79,7 @@ services: JAVA_TOOL_OPTIONS: "-XX:InitialRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0" ### DEBUG: Uncomment next line to enable java debugging # JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 - restart: unless-stopped + restart: no depends_on: - dbpostgresql deploy: diff --git a/k6-tests/setup.sh b/k6-tests/setup.sh index 3a121cf157..c01a0f6c60 100755 --- a/k6-tests/setup.sh +++ b/k6-tests/setup.sh @@ -26,6 +26,12 @@ docker-compose \ --profile dmi-stub \ up --quiet-pull --detach --wait || exit 1 + if [[ "$testProfile" == "kpi" ]]; then + ACTUATOR_PORT=8883 + elif [[ "$testProfile" == "endurance" ]]; then + ACTUATOR_PORT=8884 + fi + echo "Build information:" -curl http://localhost:8883/actuator/info +curl --silent --show-error http://localhost:$ACTUATOR_PORT/actuator/info echo diff --git a/k6-tests/teardown.sh b/k6-tests/teardown.sh index c3233919dc..10db7ac7e0 100755 --- a/k6-tests/teardown.sh +++ b/k6-tests/teardown.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2024 Nordix Foundation. +# Copyright 2024-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. @@ -18,6 +18,12 @@ echo '================================== docker info ==========================' docker ps -a +echo '================================== CPS-NCMP Logs ========================' +for CONTAINER_ID in $(docker ps --filter "name=cps-and-ncmp" --format "{{.ID}}"); do + echo "CPS-NCMP Logs for container: $CONTAINER_ID" + docker logs "$CONTAINER_ID" +done + testProfile=$1 docker_compose_shutdown_cmd="docker-compose -f ../docker-compose/docker-compose.yml --profile dmi-stub --project-name $testProfile down --volumes" |