Fix bug 1559 to update installers and manifests for Release TEN

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

diff --git a/installers/docker/osm_pla/pla.yaml b/installers/docker/osm_pla/pla.yaml
index 7220489..ce7326b 100644 (file)
--- a/installers/docker/osm_pla/pla.yaml
+++ b/installers/docker/osm_pla/pla.yaml
@@ -35,7 +35,7 @@ spec:
          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"]
       containers:
       - name: pla
          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"]
       containers:
       - name: pla

-        image: opensourcemano/pla:9
+        image: opensourcemano/pla:10

         env:
         - name: OSMPLA_DATABASE_HOST
           value: mongo
         env:
         - name: OSMPLA_DATABASE_HOST
           value: mongo

diff --git a/installers/docker/osm_pods/keystone.yaml b/installers/docker/osm_pods/keystone.yaml
index dfb242a..6a601db 100644 (file)
--- a/installers/docker/osm_pods/keystone.yaml
+++ b/installers/docker/osm_pods/keystone.yaml
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
       - name: keystone
     spec:
       containers:
       - name: keystone

-        image: opensourcemano/keystone:9
+        image: opensourcemano/keystone:10

         ports:
         - containerPort: 5000
           protocol: TCP
         ports:
         - containerPort: 5000
           protocol: TCP

diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml
index f66b9d3..2628408 100644 (file)
--- a/installers/docker/osm_pods/lcm.yaml
+++ b/installers/docker/osm_pods/lcm.yaml
@@ -36,7 +36,7 @@ spec:
          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 ro 9090 && nc -zvw1 mongodb-k8s 27017 ); do sleep 3; done; exit 0"]
       containers:
       - name: lcm
          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 ro 9090 && nc -zvw1 mongodb-k8s 27017 ); do sleep 3; done; exit 0"]
       containers:
       - name: lcm

-        image: opensourcemano/lcm:9
+        image: opensourcemano/lcm:10

         env:
         - name: OSMLCM_RO_HOST
           value: ro
         env:
         - name: OSMLCM_RO_HOST
           value: ro

diff --git a/installers/docker/osm_pods/mon.yaml b/installers/docker/osm_pods/mon.yaml
index c71325f..37fcdcb 100644 (file)
--- a/installers/docker/osm_pods/mon.yaml
+++ b/installers/docker/osm_pods/mon.yaml
@@ -50,7 +50,7 @@ spec:
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
       containers:
       - name: mon
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
       containers:
       - name: mon

-        image: opensourcemano/mon:9
+        image: opensourcemano/mon:10

         ports:
         - containerPort: 8662
           protocol: TCP
         ports:
         - containerPort: 8662
           protocol: TCP

diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml
index e6fdae1..54f7257 100644 (file)
--- a/installers/docker/osm_pods/nbi.yaml
+++ b/installers/docker/osm_pods/nbi.yaml
@@ -50,7 +50,7 @@ spec:
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
       containers:
       - name: nbi
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
       containers:
       - name: nbi

-        image: opensourcemano/nbi:9
+        image: opensourcemano/nbi:10

         ports:
         - containerPort: 9999
           protocol: TCP
         ports:
         - containerPort: 9999
           protocol: TCP

diff --git a/installers/docker/osm_pods/ng-ui.yaml b/installers/docker/osm_pods/ng-ui.yaml
index f2aa915..9a2e428 100644 (file)
--- a/installers/docker/osm_pods/ng-ui.yaml
+++ b/installers/docker/osm_pods/ng-ui.yaml
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
       - name: ng-ui
     spec:
       containers:
       - name: ng-ui

-        image: opensourcemano/ng-ui:9
+        image: opensourcemano/ng-ui:10

         ports:
         - containerPort: 80
           protocol: TCP
         ports:
         - containerPort: 80
           protocol: TCP

diff --git a/installers/docker/osm_pods/pol.yaml b/installers/docker/osm_pods/pol.yaml
index 9e7835f..bb09ed2 100644 (file)
--- a/installers/docker/osm_pods/pol.yaml
+++ b/installers/docker/osm_pods/pol.yaml
@@ -36,7 +36,7 @@ spec:
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
       containers:
       - name: pol
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
       containers:
       - name: pol

-        image: opensourcemano/pol:9
+        image: opensourcemano/pol:10

         env:
          - name: OSMPOL_MESSAGE_HOST
            value: kafka
         env:
          - name: OSMPOL_MESSAGE_HOST
            value: kafka

diff --git a/installers/docker/osm_pods/ro.yaml b/installers/docker/osm_pods/ro.yaml
index 1c55f99..f484a07 100644 (file)
--- a/installers/docker/osm_pods/ro.yaml
+++ b/installers/docker/osm_pods/ro.yaml
@@ -50,7 +50,7 @@ spec:
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017 ); do sleep 3; done; exit 0"]
       containers:
       - name: ro
         command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017 ); do sleep 3; done; exit 0"]
       containers:
       - name: ro

-        image: opensourcemano/ro:9
+        image: opensourcemano/ro:10

         ports:
         - containerPort: 9090
           protocol: TCP
         ports:
         - containerPort: 9090
           protocol: TCP

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 1d9cfc3..79dc474 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -981,7 +981,7 @@ function update_manifest_files() {
             list_of_services="$list_of_services $module"
         fi
     done
             list_of_services="$list_of_services $module"
         fi
     done

-    if [ ! "$OSM_DOCKER_TAG" == "9" ]; then
+    if [ ! "$OSM_DOCKER_TAG" == "10" ]; then

         parse_yaml $OSM_DOCKER_TAG $list_of_services
     fi
     if [ -n "$MODULE_DOCKER_TAG" ]; then
         parse_yaml $OSM_DOCKER_TAG $list_of_services
     fi
     if [ -n "$MODULE_DOCKER_TAG" ]; then


@@ -1378,7 +1378,7 @@ EOF
     [ -n "$KUBERNETES" ] && add_local_k8scluster
     track add_local_k8scluster
 
     [ -n "$KUBERNETES" ] && add_local_k8scluster
     track add_local_k8scluster
 

-    wget -q -O- https://osm-download.etsi.org/ftp/osm-9.0-nine/README2.txt &> /dev/null
+    wget -q -O- https://osm-download.etsi.org/ftp/osm-10.0-ten/README2.txt &> /dev/null

     track end
     return 0
 }
     track end
     return 0
 }


@@ -1560,7 +1560,7 @@ SHOWOPTS=""
 COMMIT_ID=""
 ASSUME_YES=""
 INSTALL_FROM_SOURCE=""
 COMMIT_ID=""
 ASSUME_YES=""
 INSTALL_FROM_SOURCE=""

-RELEASE="ReleaseNINE"
+RELEASE="ReleaseTEN"

 REPOSITORY="stable"
 INSTALL_VIMEMU=""
 INSTALL_PLA=""
 REPOSITORY="stable"
 INSTALL_VIMEMU=""
 INSTALL_PLA=""


@@ -1871,7 +1871,7 @@ fi
 [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
 
 #Installation starts here
 [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
 
 #Installation starts here

-wget -q -O- https://osm-download.etsi.org/ftp/osm-9.0-nine/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-10.0-ten/README.txt &> /dev/null

 track start
 
 [ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
 track start
 
 [ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0


@@ -1892,6 +1892,6 @@ export OSM_USE_LOCAL_DEVOPS=true
 #Install vim-emu (optional)
 [ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
 
 #Install vim-emu (optional)
 [ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
 

-wget -q -O- https://osm-download.etsi.org/ftp/osm-9.0-nine/README2.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-10.0-ten/README2.txt &> /dev/null

 track end
 echo -e "\nDONE"
 track end
 echo -e "\nDONE"

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index bf1c568..4e1bbb1 100755 (executable)
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -13,9 +13,9 @@
 #   limitations under the License.
 #
 REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian
 #   limitations under the License.
 #
 REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian

-RELEASE=ReleaseNINE
+RELEASE=ReleaseTEN

 REPOSITORY=stable
 REPOSITORY=stable

-DOCKER_TAG=9
+DOCKER_TAG=10

 DEVOPS_PATH=/usr/share/osm-devops
 
 function usage(){
 DEVOPS_PATH=/usr/share/osm-devops
 
 function usage(){

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 0d0f0fb..bc23e44 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -432,7 +432,7 @@ node("${params.NODE}") {
                     remote.pty = true
 
                     sshCommand remote: remote, command: """
                     remote.pty = true
 
                     sshCommand remote: remote, command: """

-                        wget https://osm-download.etsi.org/ftp/osm-9.0-nine/install_osm.sh
+                        wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh

                         chmod +x ./install_osm.sh
                         sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc
                     """
                         chmod +x ./install_osm.sh
                         sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc
                     """