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 --- a1-adapter/a1-adapter-api/feature/pom.xml | 5 +++-- a1-adapter/a1-adapter-api/installer/pom.xml | 5 +++-- a1-adapter/a1-adapter-api/model/pom.xml | 5 +++-- a1-adapter/a1-adapter-api/pom.xml | 5 +++-- a1-adapter/a1-adapter-api/provider/pom.xml | 5 +++-- a1-adapter/features/a1-adapter-northbound/pom.xml | 5 +++-- a1-adapter/features/installer/pom.xml | 5 +++-- a1-adapter/features/pom.xml | 5 +++-- a1-adapter/pom.xml | 5 +++-- a1-policy-management/pom.xml | 2 +- csit/scripts/healthcheck/.env | 9 +++++---- csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh | 4 +++- pom.xml | 5 +++-- version.properties | 2 +- 14 files changed, 40 insertions(+), 27 deletions(-) diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml index 00952bba..13a2c694 100644 --- a/a1-adapter/a1-adapter-api/feature/pom.xml +++ b/a1-adapter/a1-adapter-api/feature/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-feature - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT feature ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/installer/pom.xml b/a1-adapter/a1-adapter-api/installer/pom.xml index c8487023..44c1db03 100644 --- a/a1-adapter/a1-adapter-api/installer/pom.xml +++ b/a1-adapter/a1-adapter-api/installer/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-installer - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/model/pom.xml b/a1-adapter/a1-adapter-api/model/pom.xml index dd7dbfef..13a94d63 100644 --- a/a1-adapter/a1-adapter-api/model/pom.xml +++ b/a1-adapter/a1-adapter-api/model/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-model - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT bundle ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml index 24e0ffb0..2b3d321d 100644 --- a/a1-adapter/a1-adapter-api/pom.xml +++ b/a1-adapter/a1-adapter-api/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -30,7 +31,7 @@ org.onap.ccsdk.oran a1-adapter-api - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/provider/pom.xml b/a1-adapter/a1-adapter-api/provider/pom.xml index 43077ca0..a8655cc2 100644 --- a/a1-adapter/a1-adapter-api/provider/pom.xml +++ b/a1-adapter/a1-adapter-api/provider/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-provider - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT bundle ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml index 2c02f05b..8f735551 100644 --- a/a1-adapter/features/a1-adapter-northbound/pom.xml +++ b/a1-adapter/features/a1-adapter-northbound/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -30,7 +31,7 @@ org.onap.ccsdk.oran a1-adapter-northbound - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT feature ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/features/installer/pom.xml b/a1-adapter/features/installer/pom.xml index e1370372..a123a6c1 100644 --- a/a1-adapter/features/installer/pom.xml +++ b/a1-adapter/features/installer/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-northbound-installer - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/features/pom.xml b/a1-adapter/features/pom.xml index 7b8fb31d..554275ba 100644 --- a/a1-adapter/features/pom.xml +++ b/a1-adapter/features/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran ccsdk-a1-adapter-feature-aggregator - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml index 9b4168fb..b69e1da9 100644 --- a/a1-adapter/pom.xml +++ b/a1-adapter/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran ccsdk-a1-adapter - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml index 0d53b90c..46e0ec35 100644 --- a/a1-policy-management/pom.xml +++ b/a1-policy-management/pom.xml @@ -30,7 +30,7 @@ org.onap.ccsdk.oran a1-policy-management-service - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT ccsdk-oran :: ${project.artifactId} 17 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 diff --git a/pom.xml b/pom.xml index f9b56dd4..c2cd2235 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,8 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk oran ~ ================================================================================ - ~ Copyright (C) 2020 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2020-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. @@ -31,7 +32,7 @@ org.onap.ccsdk.oran ccsdk-oran - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT pom diff --git a/version.properties b/version.properties index 6b980ff5..553bda22 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 -sprint_number=7 +sprint_number=8 feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg