Update installers and mgmt-cluster workflows for Release SIXTEEN

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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 8855487..37cff01 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -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"

diff --git a/installers/helm/osm/Chart.yaml b/installers/helm/osm/Chart.yaml
index 5ff6410..52aa2ff 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: 16.0.0
+appVersion: "16.0.0"
 dependencies:
 - name: mysql
   repository: "https://charts.bitnami.com/bitnami"

diff --git a/installers/install_mongodb.sh b/installers/install_mongodb.sh
index f1767d8..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:-"16"}
 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/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..e8724dc 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:16
       # 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:16
       # 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:16
       # 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..a062ead 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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..4cda5df 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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:16
       # 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..b334c35 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:16
       # 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:16
       # 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:16
       # 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..cd42531 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:16
       # 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:16
       # 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:16
       # 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:16
       # imagePullPolicy: Always
       volumeMounts:
       - name: fleet-repo-volume

diff --git a/jenkins/public-clouds-tests/Jenkinsfile b/jenkins/public-clouds-tests/Jenkinsfile
index a65f5c1..82c077f 100644 (file)
--- a/jenkins/public-clouds-tests/Jenkinsfile
+++ b/jenkins/public-clouds-tests/Jenkinsfile
@@ -22,13 +22,13 @@ 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: 'relesesixteen-daily', description: 'Release for OSM binaries (REPO_BASE)', name: 'REPO_BASE')
+        string(defaultValue: 'relesesixteen-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: 'relesesixteen-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..0167b9c 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 "Exapmle: $0 16.0.0 garciadeblas"
+  echo "Exapmle: $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