From: Petri Ovaska <petri.ovaska@nokia.com>
Date: Mon, 21 Mar 2022 10:54:53 +0000 (+0200)
Subject: Upgrade v0.10.0 SDLGO tag for sdlcli and make DBAAS 0.6.1 tag
X-Git-Tag: 0.6.1^0
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a3d9c006ebaf458f8a48e9eed1b954c913f78c51;p=ric-plt%2Fdbaas.git

Upgrade v0.10.0 SDLGO tag for sdlcli and make DBAAS 0.6.1 tag

Upgrade sdlgo v0.10.0 version to enable configuration
of DBAAS_MASTER_NAME, DBAAS_SERVICE_PORT and
DBAAS_SERVICE_SENTINEL_PORT value configuration for different
DB servers. Notice that env lists are supported only in SEP
deployments (no support in RIC platform deployments).

Made also new DBAAS container to 0.6.1 version.

Issue-Id: RIC-698

Change-Id: I709865b2213b1d8b5b42fc34753b1ea0caf1b69b
Signed-off-by: Petri Ovaska <petri.ovaska@nokia.com>
---

diff --git a/container-tag.yaml b/container-tag.yaml
index 33ceb02..8dc7327 100644
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -2,4 +2,4 @@
 # This file is expected to be in the docker build directory;
 # can be moved with suitable JJB configuration.
 ---
-tag: '0.6.0'
+tag: '0.6.1'
diff --git a/docker/Dockerfile.redis b/docker/Dockerfile.redis
index e81d1cf..6d85ef2 100644
--- a/docker/Dockerfile.redis
+++ b/docker/Dockerfile.redis
@@ -1,5 +1,5 @@
 #   Copyright (c) 2019 AT&T Intellectual Property.
-#   Copyright (c) 2019 Nokia.
+#   Copyright (c) 2019-2022 Nokia.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #   platform project (RICP).
 #
 
+ARG SDLGO_TAG="v0.10.0"
 
 # Alpine-linux based containers use musl implementation of libc which causes
 # valgrind to emit false positives. Therefore we run UT with valgrind in
@@ -61,6 +62,7 @@ RUN ./autogen.sh && \
     make test
 
 FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-go:2.0.0 as build-env
+ARG SDLGO_TAG
 
 RUN apk add cpputest
 COPY ./redismodule /redismodule
@@ -72,11 +74,10 @@ RUN ./autogen.sh && \
 
 # Build sdlcli -tool
 RUN cd /go/src && \
-    git clone "https://gerrit.o-ran-sc.org/r/ric-plt/sdlgo" && \
+    git clone --depth 1 --branch ${SDLGO_TAG} "https://gerrit.o-ran-sc.org/r/ric-plt/sdlgo" && \
     cd sdlgo && \
     go build -v -o /usr/local/bin/sdlcli cmd/sdlcli/main.go
 
-
 FROM redis:6.2.6-alpine3.15 as build
 
 RUN apk --update add --upgrade --no-cache \
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 2bf3998..1ec031c 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -1,6 +1,6 @@
 ..
 ..  Copyright (c) 2019 AT&T Intellectual Property.
-..  Copyright (c) 2019 Nokia.
+..  Copyright (c) 2019-2022 Nokia.
 ..
 ..  Licensed under the Creative Commons Attribution 4.0 International
 ..  Public License (the "License"); you may not use this file except
@@ -30,6 +30,10 @@ This document provides the release notes of the dbaas.
 Version history
 ---------------
 
+[0.6.1] - 2022-03-21
+
+* Upgrade v0.10.0 SDLGO tag for sdlcli and make DBAAS 0.6.1 tag
+
 [0.6.0] - 2022-01-20
 
 * Bump Redis base image to 6.2.6, because version 5 is going soon out of maintenance