From fa81f28edaf5962fbc034ddcf783c4298573500b Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 15 Dec 2020 00:32:13 +0000 Subject: [PATCH] Installer and pipelines updates for Rel NINE Change-Id: I86786dc85eda0f717dac75049f7136bc668449d7 Signed-off-by: garciadeblas --- docker/LCM/Dockerfile | 2 +- docker/MON/Dockerfile | 2 +- docker/NBI/Dockerfile | 2 +- docker/NG-UI/Dockerfile | 2 +- docker/PLA/Dockerfile | 2 +- docker/POL/Dockerfile | 2 +- docker/RO/Dockerfile | 2 +- docker/light-ui/Dockerfile | 2 +- docker/mk/Makefile.include | 2 +- docker/mk/get_version.sh | 2 +- docker/osmclient/Dockerfile | 2 +- docker/tests/Dockerfile | 2 +- installers/full_install_osm.sh | 8 ++++---- installers/install_osm.sh | 4 ++-- installers/k8s/README-osm_k8s_monitoring.md | 2 +- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 20ac54b0..34e753a1 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -73,7 +73,7 @@ RUN curl -L https://launchpad.net/juju/2.7/2.7.6/+download/juju-2.7.6-k8s.tar.xz && mv juju /usr/local/bin/juju ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index 635577a8..fdcdd4c7 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/Dockerfile @@ -45,7 +45,7 @@ RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \ 'paramiko' 'dogpile.cache==0.9.2' ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index 6acd61d1..ca965adf 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git pyth && mkdir -p /app/storage/kafka && mkdir -p /app/log ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile index 314beff1..15e837f4 100644 --- a/docker/NG-UI/Dockerfile +++ b/docker/NG-UI/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y curl xz-utils gnupg2 \ && apt-get install -y nginx ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing ARG NGUI_VERSION diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile index 5d675e99..4451da89 100644 --- a/docker/PLA/Dockerfile +++ b/docker/PLA/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get --yes update \ && python3 -m pip install pymzn==0.18.3 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 43a271ea..879e91c7 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get --yes update \ && pip3 install pip==9.0.3 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index 4783c01a..25907b78 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get -y install curl software-properties-common git tox && python3 -m pip install --upgrade pip && python3 -m pip install pyangbind networking-l2gw ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile index b41904be..d855aae0 100644 --- a/docker/light-ui/Dockerfile +++ b/docker/light-ui/Dockerfile @@ -32,7 +32,7 @@ RUN apt-get update \ RUN echo "daemon off;" >> /etc/nginx/nginx.conf ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing ARG LWUI_VERSION diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index e1a6affd..4105295e 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -22,7 +22,7 @@ all: build TAG ?= 6 REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian -RELEASE ?= ReleaseEIGHT-daily +RELEASE ?= ReleaseNINE-daily REPOSITORY_KEY ?= OSM%20ETSI%20Release%20Key.gpg REPOSITORY ?= testing NO_CACHE ?= --no-cache diff --git a/docker/mk/get_version.sh b/docker/mk/get_version.sh index af2036c1..2fae03a5 100755 --- a/docker/mk/get_version.sh +++ b/docker/mk/get_version.sh @@ -15,7 +15,7 @@ # limitations under the License. # -RELEASE="ReleaseEIGHT-daily" +RELEASE="ReleaseNINE-daily" REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg" REPOSITORY="testing" REPOSITORY_BASE="http://osm-download.etsi.org/repository/osm/debian" diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index ab1a8ac6..68fa3e76 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install wget pyt RUN python3 -m pip install -U pip && python3 -m pip install pyyaml python-magic pyangbind pytest==4.6.3 verboselogs ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 3cb1db5d..07a46cfd 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -24,7 +24,7 @@ RUN python3 -m pip install haikunator requests robotframework robotframework-sel verboselogs pyangbind ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseEIGHT-daily +ARG RELEASE=ReleaseNINE-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing ARG TESTS_VERSION diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index d2b08db4..77b3fb85 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -1371,7 +1371,7 @@ EOF [ -n "$KUBERNETES" ] && add_local_k8scluster track add_local_k8scluster - wget -q -O- https://osm-download.etsi.org/ftp/osm-8.0-eight/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-9.0-nine/README2.txt &> /dev/null track end return 0 } @@ -1520,7 +1520,7 @@ SHOWOPTS="" COMMIT_ID="" ASSUME_YES="" INSTALL_FROM_SOURCE="" -RELEASE="ReleaseEIGHT" +RELEASE="ReleaseNINE" REPOSITORY="stable" INSTALL_VIMEMU="" INSTALL_PLA="" @@ -1810,7 +1810,7 @@ fi [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0 #Installation starts here -wget -q -O- https://osm-download.etsi.org/ftp/osm-8.0-eight/README.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-9.0-nine/README.txt &> /dev/null track start [ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0 @@ -1831,7 +1831,7 @@ export OSM_USE_LOCAL_DEVOPS=true #Install vim-emu (optional) [ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu -wget -q -O- https://osm-download.etsi.org/ftp/osm-8.0-eight/README2.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-9.0-nine/README2.txt &> /dev/null track end echo -e "\nDONE" diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 08eb1acf..d5df8b12 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=ReleaseEIGHT +RELEASE=ReleaseNINE REPOSITORY=stable -DOCKER_TAG=8 +DOCKER_TAG=9 function usage(){ echo -e "usage: $0 [OPTIONS]" diff --git a/installers/k8s/README-osm_k8s_monitoring.md b/installers/k8s/README-osm_k8s_monitoring.md index 1ce8bd0d..b9a60c1b 100644 --- a/installers/k8s/README-osm_k8s_monitoring.md +++ b/installers/k8s/README-osm_k8s_monitoring.md @@ -44,7 +44,7 @@ It is important to note that Grafana is not installed with this chart because we ## Install procedure -There are two ways to install the monitoring component based on the OSM global installer () +There are two ways to install the monitoring component based on the OSM global installer () * Using the --k8s_monitor switch in the OSM installation: diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 449d1b68..c9c5f735 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -376,7 +376,7 @@ node("${params.NODE}") { remote.logLevel = 'INFO' sshCommand remote: remote, command: """ - wget https://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh + wget https://osm-download.etsi.org/ftp/osm-9.0-nine/install_osm.sh chmod +x ./install_osm.sh """ -- 2.17.1