From eb0b1d49045f35ca0c23f7636edef010d819f891 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Mon, 8 Sep 2025 15:09:18 +0100 Subject: [PATCH] Update version for nonrtric-plt-informationcoordinatorservice to 1.6.1 Issue-ID: NONRTRIC-1095 Change-Id: I1d83c291844b0bcd2f708f3b2d70dfe32e6e3e24 Signed-off-by: JohnKeeney --- .../ics-producer-consumer/docker-compose.yaml | 166 ++++++++++----------- sample-services/ics-producer-consumer/start.sh | 2 +- .../tests/docker-compose.yaml | 2 +- test/common/test_env-onap-paris.sh | 2 +- test/common/test_env-oran-l-release.sh | 4 +- 5 files changed, 88 insertions(+), 88 deletions(-) diff --git a/sample-services/ics-producer-consumer/docker-compose.yaml b/sample-services/ics-producer-consumer/docker-compose.yaml index d9239bc1..d4f77e1e 100644 --- a/sample-services/ics-producer-consumer/docker-compose.yaml +++ b/sample-services/ics-producer-consumer/docker-compose.yaml @@ -1,83 +1,83 @@ -# ========================LICENSE_START================================= -# O-RAN-SC -# -# Copyright (C) 2024: OpenInfra Foundation Europe -# ======================================================================== -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END================================================= - -version: '2' - -networks: - my-network: - name: kafka - driver: bridge - -services: - kafka-zkless: - container_name: kafka-zkless - image: quay.io/strimzi/kafka:latest-kafka-2.8.1-amd64 - command: - [ - "sh", - "-c", - "export CLUSTER_ID=$$(bin/kafka-storage.sh random-uuid) && bin/kafka-storage.sh format -t $$CLUSTER_ID -c config/kraft/server.properties && bin/kafka-server-start.sh config/kraft/server.properties --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override listener.security.protocol.map=$${KAFKA_LISTENER_SECURITY_PROTOCOL_MAP} --override listeners=$${KAFKA_LISTENERS}", - ] - ports: - - "9092:9092" - environment: - LOG_DIR: "/tmp/logs" - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT - KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092,CONTROLLER://:9093 - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka-zkless:29092,PLAINTEXT_HOST://kafka-zkless:9092 - tty: true - stdin_open: true - networks: - - my-network - - informationcoordinator: - image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.6.0 - container_name: informationcoordinatorservice - ports: - - "8083:8083" - volumes: - - ./application.yaml:/opt/app/information-coordinator-service/config/application.yaml - networks: - - my-network - - kafka-producer: - image: o-ran-sc/nonrtric-sample-icsproducer:latest - container_name: kafka-producer - environment: - - KAFKA_SERVERS=kafka-zkless:9092 - ports: - - "8080:8080" - networks: - - my-network - - kafka-consumer: - image: o-ran-sc/nonrtric-sample-icsconsumer:latest - container_name: kafka-consumer - environment: - - KAFKA_SERVERS=kafka-zkless:9092 - ports: - - "8081:8081" - networks: - - my-network - - curl-client: - image: curlimages/curl:latest - container_name: curl-client - command: ["tail", "-f", "/dev/null"] - networks: - - my-network +# ========================LICENSE_START================================= +# O-RAN-SC +# +# Copyright (C) 2024: OpenInfra Foundation Europe +# ======================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END================================================= + +version: '2' + +networks: + my-network: + name: kafka + driver: bridge + +services: + kafka-zkless: + container_name: kafka-zkless + image: quay.io/strimzi/kafka:latest-kafka-2.8.1-amd64 + command: + [ + "sh", + "-c", + "export CLUSTER_ID=$$(bin/kafka-storage.sh random-uuid) && bin/kafka-storage.sh format -t $$CLUSTER_ID -c config/kraft/server.properties && bin/kafka-server-start.sh config/kraft/server.properties --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override listener.security.protocol.map=$${KAFKA_LISTENER_SECURITY_PROTOCOL_MAP} --override listeners=$${KAFKA_LISTENERS}", + ] + ports: + - "9092:9092" + environment: + LOG_DIR: "/tmp/logs" + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT + KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092,CONTROLLER://:9093 + KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka-zkless:29092,PLAINTEXT_HOST://kafka-zkless:9092 + tty: true + stdin_open: true + networks: + - my-network + + informationcoordinator: + image: nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.6.1 + container_name: informationcoordinatorservice + ports: + - "8083:8083" + volumes: + - ./application.yaml:/opt/app/information-coordinator-service/config/application.yaml + networks: + - my-network + + kafka-producer: + image: o-ran-sc/nonrtric-sample-icsproducer:latest + container_name: kafka-producer + environment: + - KAFKA_SERVERS=kafka-zkless:9092 + ports: + - "8080:8080" + networks: + - my-network + + kafka-consumer: + image: o-ran-sc/nonrtric-sample-icsconsumer:latest + container_name: kafka-consumer + environment: + - KAFKA_SERVERS=kafka-zkless:9092 + ports: + - "8081:8081" + networks: + - my-network + + curl-client: + image: curlimages/curl:latest + container_name: curl-client + command: ["tail", "-f", "/dev/null"] + networks: + - my-network diff --git a/sample-services/ics-producer-consumer/start.sh b/sample-services/ics-producer-consumer/start.sh index 0a4ce857..bc3ccde7 100755 --- a/sample-services/ics-producer-consumer/start.sh +++ b/sample-services/ics-producer-consumer/start.sh @@ -44,7 +44,7 @@ docker run -d \ --name informationcoordinatorservice \ -p 8083:8083 \ -v ./application.yaml:/opt/app/information-coordinator-service/config/application.yaml \ - nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.6.0 + nexus3.o-ran-sc.org:10001/o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.6.1 # Start Producer docker run -d \ diff --git a/sample-services/ics-simple-producer-consumer/tests/docker-compose.yaml b/sample-services/ics-simple-producer-consumer/tests/docker-compose.yaml index 1ae9537b..97ebe5b8 100644 --- a/sample-services/ics-simple-producer-consumer/tests/docker-compose.yaml +++ b/sample-services/ics-simple-producer-consumer/tests/docker-compose.yaml @@ -1,6 +1,6 @@ services: informationcoordinator: - image: ${REGISTRY}o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.6.0 + image: ${REGISTRY}o-ran-sc/nonrtric-plt-informationcoordinatorservice:1.6.1 container_name: informationcoordinatorservice ports: - "8083:8083" diff --git a/test/common/test_env-onap-paris.sh b/test/common/test_env-onap-paris.sh index be1a8c3e..5b2304bf 100644 --- a/test/common/test_env-onap-paris.sh +++ b/test/common/test_env-onap-paris.sh @@ -88,7 +88,7 @@ SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" # ICS image and tag - using i release ICS_IMAGE_BASE="o-ran-sc/nonrtric-plt-informationcoordinatorservice" -ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.6.0" +ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.6.1" #Note: Update var ICS_FEATURE_LEVEL if image version is changed # Control Panel image and tag - using i release diff --git a/test/common/test_env-oran-l-release.sh b/test/common/test_env-oran-l-release.sh index 8104caf5..499978cd 100644 --- a/test/common/test_env-oran-l-release.sh +++ b/test/common/test_env-oran-l-release.sh @@ -69,8 +69,8 @@ A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.10.0" ICS_IMAGE_BASE="o-ran-sc/nonrtric-plt-informationcoordinatorservice" ICS_IMAGE_TAG_LOCAL="1.7.0-SNAPSHOT" ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.7.0-SNAPSHOT" -ICS_IMAGE_TAG_REMOTE="1.6.0" -ICS_IMAGE_TAG_REMOTE_RELEASE="1.6.0" +ICS_IMAGE_TAG_REMOTE="1.6.1" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.6.1" #Note: Update var ICS_FEATURE_LEVEL if image version is changed #Control Panel image and tags -- 2.16.6