From d8d96796095909b5f162c56c976fc9e52967028c Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Thu, 27 Jun 2024 19:50:52 +0100 Subject: [PATCH 1/1] Roll versions after J-Relase (j-release branch) Issue-ID: NONRTRIC-972 Change-Id: I7cfd3c954410d6433d06e46d71112cdd59043655 Signed-off-by: JohnKeeney --- capifcore/container-tag.yaml | 2 +- docs/conf.py | 2 +- servicemanager/README.md | 2 +- servicemanager/container-tag.yaml | 2 +- servicemanager/docker-compose.yaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/capifcore/container-tag.yaml b/capifcore/container-tag.yaml index f17eeca..1bcde35 100644 --- a/capifcore/container-tag.yaml +++ b/capifcore/container-tag.yaml @@ -20,4 +20,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: 1.3.1 +tag: 1.3.2 diff --git a/docs/conf.py b/docs/conf.py index 311d5e7..d4f95e6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,7 @@ from docs_conf.conf import * #branch configuration -branch = 'latest' +branch = 'j-release' linkcheck_ignore = [ 'http://localhost.*', diff --git a/servicemanager/README.md b/servicemanager/README.md index 4be8951..5a245b0 100644 --- a/servicemanager/README.md +++ b/servicemanager/README.md @@ -63,7 +63,7 @@ export SERVICE_MANAGER_ENV=development ### CAPIFcore and Kong -We also need Kong and CAPIFcore to be running. Please see the examples in the `deploy` folder. You can also use https://gerrit.o-ran-sc.org/r/it/dep for deployment. Please see the notes at https://wiki.o-ran-sc.org/display/RICNR/%5BWIP%5D+Service+Manager. +We also need Kong and CAPIFcore to be running. Please see the examples in the `deploy` folder. You can also use https://gerrit.o-ran-sc.org/r/it/dep for deployment. Please see the notes at https://wiki.o-ran-sc.org/display/RICNR/Release+J%3A+Service+Manager. ## Build diff --git a/servicemanager/container-tag.yaml b/servicemanager/container-tag.yaml index ced992f..c850c4e 100644 --- a/servicemanager/container-tag.yaml +++ b/servicemanager/container-tag.yaml @@ -19,4 +19,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: 0.1.2 +tag: 0.1.3 diff --git a/servicemanager/docker-compose.yaml b/servicemanager/docker-compose.yaml index 6815056..c9d7d9b 100644 --- a/servicemanager/docker-compose.yaml +++ b/servicemanager/docker-compose.yaml @@ -19,7 +19,7 @@ version: '3.5' services: capifcore: container_name: sme-capifcore - image: capifcore:latest + image: capifcore:1.3.1 ports: - 8090:8090 entrypoint: ["/capifcore"] @@ -28,7 +28,7 @@ services: servicemanager: container_name: servicemanager - image: servicemanager:latest + image: servicemanager:0.1.2 environment: - SERVICE_MANAGER_ENV="" ports: -- 2.16.6