From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 21 Dec 2023 10:01:58 +0000 (+0100)
Subject: Fix image tag in full_install_osm, helm chart and install_osm
X-Git-Tag: v15.0.1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=bc58cbe7819877e729136df4fbfcc82b77b8c2e8;p=osm%2Fdevops.git

Fix image tag in full_install_osm, helm chart and install_osm

Change-Id: I7e423bc348feb6cc4a847f42e1de938fb7d30119
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 8d56663a..44bdbae8 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -285,7 +285,7 @@ EOF"
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}"
     fi
     [ -n "$OSM_VCA_APIPROXY" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set lcm.config.OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}"
-    [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=${OSM_DOCKER_TAG}"
+    [ ! "$OSM_DOCKER_TAG" == "15" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}"
     [ -n "${INSTALL_NGSA}" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true"
     if [ -n "${OSM_BEHIND_PROXY}" ]; then
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.behindHttpProxy=true"
diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml
index 70e83be8..e41e92c3 100644
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -26,7 +26,7 @@ global:
     repositoryBase: docker.io/opensourcemano
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "testing-daily"
+    tag: "15"
 
   imagePullSecrets: []
   nameOverride: ""
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 23644215..092b38c8 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -15,7 +15,7 @@
 REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian
 RELEASE=ReleaseFIFTEEN
 REPOSITORY=stable
-DOCKER_TAG="testing-daily"
+DOCKER_TAG="15"
 DEVOPS_PATH=/usr/share/osm-devops
 
 function usage(){