From a14e62880d8ea31b1ada3f6f1c06f191eec971fb Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 8 Nov 2021 12:40:18 +0100 Subject: [PATCH] Fix bug 1744 to update installers and manifests for Release ELEVEN Change-Id: I40af57c22e28e6b4a22d25edb8e0a0110f251093 Signed-off-by: garciadeblas --- installers/docker/osm_pla/pla.yaml | 2 +- installers/docker/osm_pods/keystone.yaml | 2 +- installers/docker/osm_pods/lcm.yaml | 2 +- installers/docker/osm_pods/mon.yaml | 2 +- installers/docker/osm_pods/nbi.yaml | 2 +- installers/docker/osm_pods/ng-ui.yaml | 2 +- installers/docker/osm_pods/pol.yaml | 2 +- installers/docker/osm_pods/ro.yaml | 2 +- installers/full_install_osm.sh | 8 ++++---- installers/install_osm.sh | 4 ++-- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/installers/docker/osm_pla/pla.yaml b/installers/docker/osm_pla/pla.yaml index ce7326bc..00c5cb01 100644 --- 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 - image: opensourcemano/pla:10 + image: opensourcemano/pla:11 env: - name: OSMPLA_DATABASE_HOST value: mongo diff --git a/installers/docker/osm_pods/keystone.yaml b/installers/docker/osm_pods/keystone.yaml index 6a601db8..66ab4801 100644 --- a/installers/docker/osm_pods/keystone.yaml +++ b/installers/docker/osm_pods/keystone.yaml @@ -46,7 +46,7 @@ spec: spec: containers: - name: keystone - image: opensourcemano/keystone:10 + image: opensourcemano/keystone:11 ports: - containerPort: 5000 protocol: TCP diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml index 26284088..2493de6b 100644 --- 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 - image: opensourcemano/lcm:10 + image: opensourcemano/lcm:11 env: - name: OSMLCM_RO_HOST value: ro diff --git a/installers/docker/osm_pods/mon.yaml b/installers/docker/osm_pods/mon.yaml index 37fcdcb4..7f2ef746 100644 --- 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 - image: opensourcemano/mon:10 + image: opensourcemano/mon:11 ports: - containerPort: 8662 protocol: TCP diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml index 54f72571..29780828 100644 --- 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 - image: opensourcemano/nbi:10 + image: opensourcemano/nbi:11 ports: - containerPort: 9999 protocol: TCP diff --git a/installers/docker/osm_pods/ng-ui.yaml b/installers/docker/osm_pods/ng-ui.yaml index 9a2e4285..f5b16582 100644 --- 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 - image: opensourcemano/ng-ui:10 + image: opensourcemano/ng-ui:11 ports: - containerPort: 80 protocol: TCP diff --git a/installers/docker/osm_pods/pol.yaml b/installers/docker/osm_pods/pol.yaml index bb09ed26..7f142255 100644 --- 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 - image: opensourcemano/pol:10 + image: opensourcemano/pol:11 env: - name: OSMPOL_MESSAGE_HOST value: kafka diff --git a/installers/docker/osm_pods/ro.yaml b/installers/docker/osm_pods/ro.yaml index f484a073..a8a6d7eb 100644 --- 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 - image: opensourcemano/ro:10 + image: opensourcemano/ro:11 ports: - containerPort: 9090 protocol: TCP diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 6689919e..1202e33b 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -558,7 +558,7 @@ function update_manifest_files() { list_of_services="$list_of_services $module" fi done - if [ ! "$OSM_DOCKER_TAG" == "10" ]; then + if [ ! "$OSM_DOCKER_TAG" == "11" ]; then parse_yaml $OSM_DOCKER_TAG $list_of_services fi if [ -n "$MODULE_DOCKER_TAG" ]; then @@ -722,7 +722,7 @@ function install_osm() { add_local_k8scluster track add_local_k8scluster - wget -q -O- https://osm-download.etsi.org/ftp/osm-10.0-ten/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-11.0-eleven/README2.txt &> /dev/null track end sudo find /etc/osm [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function @@ -1168,7 +1168,7 @@ OSM_K8S_WORK_DIR="$OSM_DOCKER_WORK_DIR/osm_pods" && OSM_NAMESPACE_VOL="${OSM_HOS [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0 #Installation starts here -wget -q -O- https://osm-download.etsi.org/ftp/osm-10.0-ten/README.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-11.0-eleven/README.txt &> /dev/null OSM_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)" track start release $RELEASE none none docker_tag $OSM_DOCKER_TAG none none @@ -1184,7 +1184,7 @@ echo -e "Checking required packages: lxd" lxd --version &>/dev/null || FATAL "lxd not present, exiting." [ -n "$INSTALL_LXD" ] && echo -e "\nInstalling and configuring lxd" && install_lxd -wget -q -O- https://osm-download.etsi.org/ftp/osm-10.0-ten/README2.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-11.0-eleven/README2.txt &> /dev/null track end echo -e "\nDONE" diff --git a/installers/install_osm.sh b/installers/install_osm.sh index b1b8548e..d66ceb34 100755 --- 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 -RELEASE=ReleaseTEN +RELEASE=ReleaseELEVEN REPOSITORY=stable -DOCKER_TAG=10 +DOCKER_TAG=11 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 e93c9a91..a96e5454 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -445,7 +445,7 @@ node("${params.NODE}") { remote.pty = true sshCommand remote: remote, command: """ - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh + wget https://osm-download.etsi.org/ftp/osm-11.0-eleven/install_osm.sh chmod +x ./install_osm.sh sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc """ -- 2.17.1