From: elinuxhenrik Date: Thu, 3 Dec 2020 14:56:17 +0000 (+0100) Subject: Step versions on master X-Git-Tag: 2.1.1~7^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=32157220c43100bd0ab49da4f6232348ee2e99fe;p=nonrtric.git Step versions on master Change-Id: I932759a31af488af3cba69364f5842d145dcd881 Issue-ID: NONRTRIC-352 Signed-off-by: elinuxhenrik --- diff --git a/docker-compose/ecs/docker-compose.yml b/docker-compose/ecs/docker-compose.yml index f7d2f77c..8b64e253 100644 --- a/docker-compose/ecs/docker-compose.yml +++ b/docker-compose/ecs/docker-compose.yml @@ -22,7 +22,7 @@ networks: services: ecs: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0 container_name: ecs networks: default: @@ -33,7 +33,7 @@ services: - 8434:8434 policy-control-panel: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0 container_name: policy-control-panel networks: - default diff --git a/docker-compose/nosdnc/docker-compose.yml b/docker-compose/nosdnc/docker-compose.yml index 48334038..c57cd29e 100644 --- a/docker-compose/nosdnc/docker-compose.yml +++ b/docker-compose/nosdnc/docker-compose.yml @@ -22,7 +22,7 @@ networks: services: policy-agent: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0 container_name: policy-agent networks: default: @@ -66,7 +66,7 @@ services: - ALLOW_HTTP=true policy-control-panel: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0 container_name: policy-control-panel networks: - default diff --git a/docker-compose/rapp/docker-compose.yml b/docker-compose/rapp/docker-compose.yml index 1e4763af..3265408a 100644 --- a/docker-compose/rapp/docker-compose.yml +++ b/docker-compose/rapp/docker-compose.yml @@ -22,7 +22,7 @@ networks: services: r-app: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-r-app-catalogue:1.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-r-app-catalogue:1.1.0 container_name: r-app networks: default: diff --git a/docker-compose/sdnc/docker-compose.yml b/docker-compose/sdnc/docker-compose.yml index 3f5410fe..9796ecee 100644 --- a/docker-compose/sdnc/docker-compose.yml +++ b/docker-compose/sdnc/docker-compose.yml @@ -22,7 +22,7 @@ networks: services: policy-agent: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0 container_name: policy-agent networks: default: @@ -66,7 +66,7 @@ services: - ALLOW_HTTP=true policy-control-panel: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0 container_name: policy-control-panel networks: - default diff --git a/docker-compose/withDmaap_nosdnc/docker-compose.yml b/docker-compose/withDmaap_nosdnc/docker-compose.yml index 7259a4f6..f2026b0d 100644 --- a/docker-compose/withDmaap_nosdnc/docker-compose.yml +++ b/docker-compose/withDmaap_nosdnc/docker-compose.yml @@ -22,7 +22,7 @@ networks: services: policy-agent: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0 container_name: policy-agent networks: default: @@ -67,7 +67,7 @@ services: - ALLOW_HTTP=true policy-control-panel: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0 container_name: policy-control-panel networks: - default diff --git a/docs/offeredapis/swagger/ecs-api.json b/docs/offeredapis/swagger/ecs-api.json index 303a9253..3684c0ee 100644 --- a/docs/offeredapis/swagger/ecs-api.json +++ b/docs/offeredapis/swagger/ecs-api.json @@ -742,4 +742,4 @@ "description": "Status Controller" } ] -} \ No newline at end of file +} diff --git a/enrichment-coordinator-service/pom.xml b/enrichment-coordinator-service/pom.xml index f7d6e5e6..d34c9a6b 100644 --- a/enrichment-coordinator-service/pom.xml +++ b/enrichment-coordinator-service/pom.xml @@ -31,7 +31,7 @@ org.o-ran-sc.nonrtric enrichment-coordinator-service - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT The Apache Software License, Version 2.0 diff --git a/policy-agent/README.md b/policy-agent/README.md index 490a94fa..d660df91 100644 --- a/policy-agent/README.md +++ b/policy-agent/README.md @@ -34,7 +34,7 @@ volumes: The target paths in the container should not be modified. Example docker run command for mounting new files (assuming they are located in the current directory): -docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.1.0-SNAPSHOT +docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.2.0-SNAPSHOT To Run Policy Agent in Local: diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml index 41df80ef..d18c9f75 100644 --- a/policy-agent/pom.xml +++ b/policy-agent/pom.xml @@ -31,7 +31,7 @@ org.o-ran-sc.nonrtric policy-agent - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 92d50a61..d8717090 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.o-ran-sc nonrtric - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT pom nonrtric diff --git a/r-app-catalogue/pom.xml b/r-app-catalogue/pom.xml index 110f2d0c..a2e05656 100644 --- a/r-app-catalogue/pom.xml +++ b/r-app-catalogue/pom.xml @@ -31,7 +31,7 @@ org.o-ran-sc.nonrtric r-app-catalogue - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT The Apache Software License, Version 2.0 diff --git a/test/common/test_env.sh b/test/common/test_env.sh index 293e993a..a8e618fe 100644 --- a/test/common/test_env.sh +++ b/test/common/test_env.sh @@ -25,24 +25,24 @@ # Local Policy Agent image and tag POLICY_AGENT_LOCAL_IMAGE="o-ran-sc/nonrtric-policy-agent" -POLICY_AGENT_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT" +POLICY_AGENT_LOCAL_IMAGE_TAG="2.2.0-SNAPSHOT" # Remote Policy Agent image and tag POLICY_AGENT_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent" -POLICY_AGENT_REMOTE_IMAGE_TAG="2.1.0" +POLICY_AGENT_REMOTE_IMAGE_TAG="2.2.0" # Local ECS image and tag ECS_LOCAL_IMAGE="o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_LOCAL_IMAGE_TAG="1.0.0-SNAPSHOT" +ECS_LOCAL_IMAGE_TAG="1.1.0-SNAPSHOT" # Remote ECS image and tag ECS_REMOTE_IMAGE="nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_REMOTE_IMAGE_TAG="1.0.0-SNAPSHOT" +ECS_REMOTE_IMAGE_TAG="1.1.0-SNAPSHOT" # Control Panel local image and tag CONTROL_PANEL_LOCAL_IMAGE="o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT" +CONTROL_PANEL_LOCAL_IMAGE_TAG="2.2.0-SNAPSHOT" # Control Panel remote image and tag CONTROL_PANEL_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_REMOTE_IMAGE_TAG="2.0.0" +CONTROL_PANEL_REMOTE_IMAGE_TAG="2.2.0" # SDNC A1 Controller local image and tag