From d31b23f9cdc21b0377a9e520f7b4a3a333a45b9d Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Thu, 20 Jun 2024 19:10:40 +0100 Subject: Roll master branch versions to 1.8.0 after New Delhi release Issue-ID: CCSDK-4020 Change-Id: I06ba58fc333c8a2d2670a2e88529dc39bdc61a2c Signed-off-by: JohnKeeney --- csit/scripts/healthcheck/.env | 9 +++++---- csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'csit') diff --git a/csit/scripts/healthcheck/.env b/csit/scripts/healthcheck/.env index 727d9336..c9b3561d 100644 --- a/csit/scripts/healthcheck/.env +++ b/csit/scripts/healthcheck/.env @@ -1,5 +1,6 @@ # ============LICENSE_START=============================================== -# Copyright (C) 2021 Nordix Foundation. All rights reserved. +# Copyright (C) 2021-2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,11 +18,11 @@ #PMS PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" -PMS_IMAGE_TAG="1.7.0-SNAPSHOT-latest" +PMS_IMAGE_TAG="1.8.0-SNAPSHOT-latest" #A1_SIM A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator" -A1_SIM_IMAGE_TAG="2.1.0" +A1_SIM_IMAGE_TAG="2.7.0" #DB DB_IMAGE_BASE="mariadb" @@ -29,4 +30,4 @@ DB_IMAGE_TAG="10.5" #A1CONTROLLER A1CONTROLLER_IMAGE_BASE="nexus3.onap.org:10002/onap/sdnc-image" -A1CONTROLLER_IMAGE_TAG="2.3.0" +A1CONTROLLER_IMAGE_TAG="2.6.1" diff --git a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh index 6513f789..79c08b63 100755 --- a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh +++ b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh @@ -45,6 +45,8 @@ checkStatus(){ fi done echo -e "$i sec: $4 is NOT alive!\n" + echo "Capturing docker logs (before exiting) ..." + docker-compose --env-file .env -f docker-compose.yml -f sdnc/docker-compose.yml logs exit -1 } @@ -71,7 +73,7 @@ curl -sSkw %{http_code} http://localhost:8081/actuator/loggers/org.onap.ccsdk. # check SDNC status echo "check SDNC status:" -checkStatus 300 "curl -sS -o /dev/null -I -w %{http_code} http://localhost:8282/apidoc/explorer/ " "200" "SDNC" +checkStatus 300 "curl -sS -o /dev/null -I -w %{http_code} http://localhost:8282/apidoc/explorer/index.html " "200" "SDNC" cd ${SHELL_FOLDER}/../data ./preparePmsData.sh -- cgit 1.2.3-korg