Prepare installers, Jenkins and mgmt-cluster for Release SEVENTEEN

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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index f6f30e0..8a5e9f5 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -220,8 +220,8 @@ EOF"
     # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set nbi.useOsmSecret=false"
 
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repositoryBase=${DOCKER_REGISTRY_URL}${DOCKER_USER}"
-    [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}"
-    [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}"
+    [ ! "$OSM_DOCKER_TAG" == "17" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}"
+    [ ! "$OSM_DOCKER_TAG" == "17" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}"
 
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.hostname=${OSM_K8S_EXTERNAL_IP}.nip.io"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set grafana.ingress.hosts={grafana.${OSM_K8S_EXTERNAL_IP}.nip.io}"
@@ -282,7 +282,7 @@ function deploy_charmed_services() {
 #deploy mongodb
 function deploy_mongodb() {
     [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
-    MONGO_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
+    MONGO_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
     [ -n "${DOCKER_REGISTRY_URL}" ] && MONGO_OPTS="${MONGO_OPTS} -r ${DOCKER_REGISTRY_URL}"
     $OSM_DEVOPS/installers/install_mongodb.sh ${MONGO_OPTS} || \
     FATAL_TRACK install_osm_mongodb_service "install_mongodb.sh failed"
@@ -595,7 +595,7 @@ function install_osm() {
         arrange_docker_default_network_policy
     fi
 
-    wget -q -O- https://osm-download.etsi.org/ftp/osm-16.0-sixteen/README2.txt &> /dev/null
+    wget -q -O- https://osm-download.etsi.org/ftp/osm-17.0-seventeen/README2.txt &> /dev/null
     track end
     sudo find /etc/osm
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -745,8 +745,8 @@ ASSUME_YES=""
 APT_PROXY_URL=""
 K8S_CLUSTER_ENGINE="k3s"
 DEBUG_INSTALL=""
-RELEASE="testing-daily"
-REPOSITORY="testing"
+RELEASE="ReleaseSEVENTEEN"
+REPOSITORY="stable"
 INSTALL_K8S_MONITOR=""
 INSTALL_NGSA="y"
 INSTALL_PLA=""
@@ -785,7 +785,7 @@ OSM_WORK_DIR="/etc/osm"
 OSM_HELM_WORK_DIR="${OSM_WORK_DIR}/helm"
 OSM_HOST_VOL="/var/lib/osm"
 OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_NAMESPACE}"
-OSM_DOCKER_TAG="testing-daily"
+OSM_DOCKER_TAG="17"
 DOCKER_USER=opensourcemano
 PULL_IMAGES="y"
 KAFKA_TAG=2.11-1.0.2
@@ -993,7 +993,7 @@ fi
 # Installation starts here
 
 # Get README and create OSM_TRACK_INSTALLATION_ID
-wget -q -O- https://osm-download.etsi.org/ftp/osm-16.0-sixteen/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-17.0-seventeen/README.txt &> /dev/null
 export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)"
 
 # Get OS info to be tracked
@@ -1009,7 +1009,7 @@ if [ -n "$CHARMED" ]; then
     sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works"
     ${OSM_DEVOPS}/installers/charmed_install.sh --tag $OSM_DOCKER_TAG "$@" || \
     FATAL_TRACK charmed_install "charmed_install.sh failed"
-    wget -q -O- https://osm-download.etsi.org/ftp/osm-16.0-sixteen/README2.txt &> /dev/null
+    wget -q -O- https://osm-download.etsi.org/ftp/osm-17.0-seventeen/README2.txt &> /dev/null
     echo -e "\nDONE"
     exit 0
 elif [ -n "$INSTALL_TO_OPENSTACK" ]; then

diff --git a/installers/helm/osm/Chart.yaml b/installers/helm/osm/Chart.yaml
index 5ff6410..2fa6160 100644 (file)
--- a/installers/helm/osm/Chart.yaml
+++ b/installers/helm/osm/Chart.yaml
@@ -19,8 +19,8 @@ name: osm
 description: A Helm chart for Open Source MANO (OSM)
 type: application
 icon: https://www.etsi.org/images/articles/logos/OSM.png
-version: 0.0.1
-appVersion: "16"
+version: "17.0.0"
+appVersion: "17.0.0"
 dependencies:
 - name: mysql
   repository: "https://charts.bitnami.com/bitnami"

diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml
index 1a02c5a..24d0a2e 100644 (file)
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -27,7 +27,7 @@ global:
     repositoryBase: docker.io/opensourcemano
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "testing-daily"
+    tag: "17"
 
   imagePullSecrets: []
   nameOverride: ""
@@ -220,7 +220,7 @@ keystone:
     port: 5000
   image: {}
     # repository: opensourcemano/keystone
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
   useOsmSecret: true
   # secretName: "keystone-secret"
@@ -230,7 +230,7 @@ lcm:
   logLevel: DEBUG
   image: {}
     # repository: opensourcemano/lcm
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
   useOsmSecret: true
   # secretName: "lcm-secret"
@@ -255,7 +255,7 @@ mon:
   # logLevel: DEBUG
   image: {}
     # repository: opensourcemano/mon
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
   useOsmSecret: true
   # secretName: "mon-secret"
@@ -278,7 +278,7 @@ nbi:
   #   nodePort: 9999
   image: {}
     # repository: opensourcemano/nbi
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
   useOsmSecret: true
   # secretName: "nbi-secret"
@@ -303,7 +303,7 @@ ngui:
   #   host: <IP_ADDRESS>.nip.io
   image: {}
     # repository: opensourcemano/ng-ui
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
 
 # pla module is disabled by default unless global.oldServiceAssurance and pla.enabled are set to true
@@ -312,7 +312,7 @@ pla:
   # logLevel: DEBUG
   image: {}
     # repository: opensourcemano/pla
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
 
 # pol module is disabled by default unless global.oldServiceAssurance and pol.enabled are set to true
@@ -321,7 +321,7 @@ pol:
   # logLevel: DEBUG
   image: {}
     # repository: opensourcemano/pol
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
   useOsmSecret: true
   # secretName: "pol-secret"
@@ -357,7 +357,7 @@ prometheus:
           # readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           # runAsNonRoot: true
-        image: opensourcemano/prometheus:testing-daily
+        image: opensourcemano/prometheus:17
         imagePullPolicy: IfNotPresent
         command: ["/bin/sh", "-c"]
         args: ["sleep 50; python -u ./app.py"]
@@ -560,7 +560,7 @@ ro:
     port: 9090
   image: {}
     # repository: opensourcemano/ro
-    # tag: "testing-daily"
+    # tag: "17"
   # replicaCount: 1
   useOsmSecret: true
   # secretName: "ro-secret"
@@ -577,7 +577,7 @@ webhookTranslator:
   # replicaCount: 1
   image: {}
     # repository: opensourcemano/webhook
-    # tag: "testing-daily"
+    # tag: "17"
   ingress: {}
   #   host: webhook.<IP_ADDRESS>.nip.io
   # replicaCount: 1

diff --git a/installers/helm/values/airflow-values.yaml b/installers/helm/values/airflow-values.yaml
index 798648c..6e03682 100644 (file)
--- a/installers/helm/values/airflow-values.yaml
+++ b/installers/helm/values/airflow-values.yaml
@@ -20,7 +20,7 @@ config:
     worker_concurrency: 2
     dags_folder: "/home/airflow/.local/lib/python3.10/site-packages/osm_ngsa"
 defaultAirflowRepository: opensourcemano/airflow
-defaultAirflowTag: "testing-daily"
+defaultAirflowTag: "17"
 executor: LocalExecutor
 extraEnv: |
   - name: AIRFLOW__API__AUTH_BACKENDS

diff --git a/installers/install_mongodb.sh b/installers/install_mongodb.sh
index 213d2f4..1611d77 100755 (executable)
--- a/installers/install_mongodb.sh
+++ b/installers/install_mongodb.sh
@@ -33,7 +33,7 @@ function install_mongodb() {
 }
 
 # main
-while getopts ":D:d:s:t:r:U:-: " o; do
+while getopts ":D:d:s:r:U:-: " o; do
     case "${o}" in
         D)
             OSM_DEVOPS="${OPTARG}"
@@ -44,9 +44,6 @@ while getopts ":D:d:s:t:r:U:-: " o; do
         s)
             OSM_NAMESPACE="${OPTARG}"
             ;;
-        t)
-            OSM_DOCKER_TAG="${OPTARG}"
-            ;;
         r)
             DOCKER_REGISTRY_URL="${OPTARG}"
             ;;
@@ -74,14 +71,12 @@ done
 
 DEBUG_INSTALL=${DEBUG_INSTALL:-}
 OSM_DEVOPS=${OSM_DEVOPS:-"/usr/share/osm-devops"}
-OSM_DOCKER_TAG=${OSM_DOCKER_TAG:-"testing-daily"}
 OSM_HELM_WORK_DIR=${OSM_HELM_WORK_DIR:-"/etc/osm/helm"}
 OSM_NAMESPACE=${OSM_NAMESPACE:-"osm"}
 DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-}
 DOCKER_USER=${DOCKER_USER:-"opensourcemano"}
 echo "DEBUG_INSTALL=$DEBUG_INSTALL"
 echo "OSM_DEVOPS=$OSM_DEVOPS"
-echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
 echo "OSM_HELM_WORK_DIR=$OSM_HELM_WORK_DIR"
 echo "OSM_NAMESPACE=$OSM_NAMESPACE"
 echo "DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL"

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 622ff36..453aeab 100755 (executable)
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -13,7 +13,7 @@
 #   limitations under the License.
 #
 REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian
-RELEASE=ReleaseSIXTEEN
+RELEASE=ReleaseSEVENTEEN
 REPOSITORY=stable
 DOCKER_TAG="testing-daily"
 DEVOPS_PATH=/usr/share/osm-devops

diff --git a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml
index 883123b..c801d89 100644 (file)
--- a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml
+++ b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cloud-accounts-wft.yaml
@@ -72,7 +72,7 @@ spec:
         value: "sw-catalogs-osm"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: CRED_SECRET_CONTENT
@@ -166,7 +166,7 @@ spec:
         value: "sw-catalogs-osm"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: CRED_SECRET_CONTENT
@@ -241,7 +241,7 @@ spec:
         value: "fleet-osm"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: DEBUG

diff --git a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
index 78fbc46..763a1bc 100644 (file)
--- a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
+++ b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml
@@ -77,7 +77,7 @@ spec:
         value: "false"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: PRIVATE_KEY_NEW_CLUSTER
@@ -181,7 +181,7 @@ spec:
         value: "false"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: PRIVATE_KEY_NEW_CLUSTER
@@ -281,7 +281,7 @@ spec:
         persistentVolumeClaim:
           claimName: '{{inputs.parameters.sw_catalogs_volume_name}}'
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       # securityContext:
       #   runAsUser: 10000
@@ -347,7 +347,7 @@ spec:
         value: "false"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: PRIVATE_KEY_NEW_CLUSTER
@@ -412,7 +412,7 @@ spec:
         value: "false"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: DEBUG
@@ -457,7 +457,7 @@ spec:
         value: "{{inputs.parameters.fleet_repo_dir}}/{{inputs.parameters.project_name}}/managed-resources/_management"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       command: ["/app/scripts/entrypoint.sh"]
       args:

diff --git a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml
index 427ae4d..a23e681 100644 (file)
--- a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml
+++ b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml
@@ -86,7 +86,7 @@ spec:
       - name: debug
         value: "false"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: SECRET_VALUES
@@ -203,7 +203,7 @@ spec:
       - name: debug
         value: "false"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: SECRET_VALUES
@@ -324,7 +324,7 @@ spec:
         value: "false"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: SECRET_VALUES
@@ -440,7 +440,7 @@ spec:
         value: "false"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: SECRET_VALUES
@@ -519,7 +519,7 @@ spec:
       - name: debug
         value: "false"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: DEBUG
@@ -584,7 +584,7 @@ spec:
       - name: debug
         value: "false"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: DEBUG
@@ -655,7 +655,7 @@ spec:
         - name: output_file
           value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: INFILE
@@ -717,7 +717,7 @@ spec:
         - name: output_file
           value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: INFILE
@@ -774,7 +774,7 @@ spec:
         - name: output_file
           value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: INFILE
@@ -836,7 +836,7 @@ spec:
         - name: output_file
           value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: INFILE
@@ -1044,7 +1044,7 @@ spec:
         - name: output_file
           value: "/results/resourcelist.{{inputs.parameters.rand_str}}.yaml"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: INFILE
@@ -1102,7 +1102,7 @@ spec:
         - name: output_file
           value: "/results/manifest.{{inputs.parameters.rand_str}}.yaml"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: INSTREAM
@@ -1162,7 +1162,7 @@ spec:
         - name: output_file
           value: "/results/manifest.{{inputs.parameters.rand_str}}.yaml"
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: INSTREAM

diff --git a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml
index 28a628e..39132ff 100644 (file)
--- a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml
+++ b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/oka-management-wft.yaml
@@ -52,7 +52,7 @@ spec:
         value: "/oka"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: DEBUG
@@ -113,7 +113,7 @@ spec:
         value: "/oka"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: DEBUG
@@ -167,7 +167,7 @@ spec:
         value: "sw-catalogs-osm"
 
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       env:
       - name: DEBUG

diff --git a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml
index 4a1a9d7..8b9de0c 100644 (file)
--- a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml
+++ b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml
@@ -48,7 +48,7 @@ spec:
         persistentVolumeClaim:
           claimName: '{{inputs.parameters.fleet_volume_name}}'
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       volumeMounts:
       - name: fleet-repo-volume
@@ -91,7 +91,7 @@ spec:
         persistentVolumeClaim:
           claimName: '{{inputs.parameters.fleet_volume_name}}'
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       volumeMounts:
       - name: fleet-repo-volume
@@ -133,7 +133,7 @@ spec:
         persistentVolumeClaim:
           claimName: '{{inputs.parameters.fleet_volume_name}}'
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       volumeMounts:
       - name: fleet-repo-volume
@@ -176,7 +176,7 @@ spec:
         persistentVolumeClaim:
           claimName: '{{inputs.parameters.fleet_volume_name}}'
     container:
-      image: opensourcemano/osm-krm-functions:testing-daily
+      image: opensourcemano/osm-krm-functions:17
       # imagePullPolicy: Always
       volumeMounts:
       - name: fleet-repo-volume

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index dbdcf9a..28ce7f3 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -549,7 +549,7 @@ node("${params.NODE}") {
                     ]
 
                     sshCommand remote: remote, command: '''
-                        wget https://osm-download.etsi.org/ftp/osm-16.0-sixteen/install_osm.sh
+                        wget https://osm-download.etsi.org/ftp/osm-17.0-seventeen/install_osm.sh
                         chmod +x ./install_osm.sh
                         sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc
                     '''

diff --git a/jenkins/public-clouds-tests/Jenkinsfile b/jenkins/public-clouds-tests/Jenkinsfile
index a65f5c1..b78472f 100644 (file)
--- a/jenkins/public-clouds-tests/Jenkinsfile
+++ b/jenkins/public-clouds-tests/Jenkinsfile
@@ -21,14 +21,14 @@ pipeline {
 
         // Parameters to define the specific OSM version to test
         // --> Defaults to latest stable version of Release FOURTEEN
-        string(defaultValue: 'https://osm-download.etsi.org/ftp/osm-16.0-sixteen/install_osm.sh', description: 'URL to OSM installer', name: 'INSTALLER_URL')
-        string(defaultValue: 'testing-daily', description: 'Release for OSM binaries (REPO_BASE)', name: 'REPO_BASE')
-        string(defaultValue: 'testing-daily', description: 'OSM docker tag (DOCKER_TAG)', name: 'DOCKER_TAG')
+        string(defaultValue: 'https://osm-download.etsi.org/ftp/osm-17.0-seventeen/install_osm.sh', description: 'URL to OSM installer', name: 'INSTALLER_URL')
+        string(defaultValue: 'releaseseventeen-daily', description: 'Release for OSM binaries (REPO_BASE)', name: 'REPO_BASE')
+        string(defaultValue: 'releaseseventeen-daily', description: 'OSM docker tag (DOCKER_TAG)', name: 'DOCKER_TAG')
         string(defaultValue: 'testing', description: 'Repository name for OSM packages (REPO_NAME)', name: 'REPO_NAME')
 
         // Parameters for docker run
         string(defaultValue: 'opensourcemano/tests', description: 'Name of docker image for client-side of Robot tests', name: 'TEST_IMAGE')
-        string(defaultValue: 'testing-daily', description: 'Tag of docker image for client-side', name: 'TEST_TAG')
+        string(defaultValue: 'releaseseventeen-daily', description: 'Tag of docker image for client-side', name: 'TEST_TAG')
 
         // Parameters to define SSH keys (Jenkins secret) used when creating VMs
         string(defaultValue: '', description: 'Jenkins credential containing SSH private key used in VMs', name: 'SSH_PRIVATE_KEY')

diff --git a/tools/change-chart-version.sh b/tools/change-chart-version.sh
index 07637cc..291d611 100755 (executable)
--- a/tools/change-chart-version.sh
+++ b/tools/change-chart-version.sh
@@ -15,8 +15,8 @@
 
 if [ "$#" -ne 2]; then
   echo "Usage: $0 <NEW_VERSION> <USER>"
-  echo "Exapmle: $0 v16.0.0 garciadeblas"
-  echo "Exapmle: $0 v15.0.7 vegall"
+  echo "Example: $0 16.0.0 garciadeblas"
+  echo "Example: $0 15.0.7 vegall"
   exit 1
 fi
 
@@ -31,7 +31,7 @@ cd devops
 
 git checkout $BRANCH_NAME
 
-sed -i -E "0,/^version: .*/s//version: $NEW_VERSION/" installers/osm/Chart.yaml
+sed -i -E "0,/^version: .*/s//version: \"$NEW_VERSION\"/" installers/osm/Chart.yaml
 sed -i -E "0,/^appVersion: .*/s//appVersion: \"$NEW_VERSION\"/" installers/helm/osm/Chart.yaml
 
 git add installers/helm/osm/Chart.yaml
@@ -39,4 +39,4 @@ git commit -m "Update chart version version to $NEW_VERSION"
 git push origin $BRANCH_NAME
 
 commit=$(git show --summary | grep commit | awk '{print $2}')
-echo "The commit is $commit"
\ No newline at end of file
+echo "The commit is $commit"