Update scripts and tools for v14
Change-Id: I2d8e0fdd323d1df0b359b3a4cfcce47fa37e4b4b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 8dbc151..591a136 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -319,7 +319,7 @@
OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.secret=${OSM_VCA_SECRET}"
OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}"
[ -n "$OSM_VCA_APIPROXY" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set lcm.config.OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}"
- [ ! "$OSM_DOCKER_TAG" == "13" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=${OSM_DOCKER_TAG}"
+ [ ! "$OSM_DOCKER_TAG" == "14" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=${OSM_DOCKER_TAG}"
[ -n "${INSTALL_NGSA}" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true"
if [ -n "${OSM_BEHIND_PROXY}" ]; then
OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.behindHttpProxy=true"
@@ -565,7 +565,7 @@
arrange_docker_default_network_policy
- wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null
track end
sudo find /etc/osm
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -970,7 +970,7 @@
# Installation starts here
# Get README and create OSM_TRACK_INSTALLATION_ID
-wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/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
@@ -986,7 +986,7 @@
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-13.0-thirteen/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null
echo -e "\nDONE"
exit 0
fi
diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml
index f4683f2..3ab8427 100644
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -26,7 +26,7 @@
repositoryBase: docker.io/opensourcemano
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
- tag: "testing-daily"
+ tag: "14"
imagePullSecrets: []
nameOverride: ""
@@ -86,7 +86,7 @@
port: 5000
image: {}
# repository: opensourcemano/keystone
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
useOsmSecret: true
# secretName: "keystone-secret"
@@ -96,7 +96,7 @@
logLevel: DEBUG
image: {}
# repository: opensourcemano/lcm
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
useOsmSecret: true
# secretName: "lcm-secret"
@@ -112,7 +112,7 @@
# logLevel: DEBUG
image: {}
# repository: opensourcemano/mon
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
useOsmSecret: true
# secretName: "mon-secret"
@@ -136,7 +136,7 @@
nodePort: 9999
image: {}
# repository: opensourcemano/nbi
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
useOsmSecret: true
# secretName: "nbi-secret"
@@ -149,7 +149,7 @@
nodePort: 80
image: {}
# repository: opensourcemano/ng-ui
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
# pla module is disabled by default unless global.oldServiceAssurance and pla.enabled are set to true
@@ -158,7 +158,7 @@
# logLevel: DEBUG
image: {}
# repository: opensourcemano/pla
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
# pol module is disabled by default unless global.oldServiceAssurance and pol.enabled are set to true
@@ -167,7 +167,7 @@
# logLevel: DEBUG
image: {}
# repository: opensourcemano/pol
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
useOsmSecret: true
# secretName: "pol-secret"
@@ -180,7 +180,7 @@
# replicaCount: 1
sidecarImage: {}
# repository: opensourcemano/ro
- # tag: "testing-daily"
+ # tag: "14"
ro:
enabled: true
@@ -189,7 +189,7 @@
port: 9090
image: {}
# repository: opensourcemano/ro
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
useOsmSecret: true
# secretName: "ro-secret"
@@ -209,7 +209,7 @@
port: 9998
image: {}
# repository: opensourcemano/webhook
- # tag: "testing-daily"
+ # tag: "14"
# replicaCount: 1
zookeeper:
diff --git a/installers/helm/values/airflow-values.yaml b/installers/helm/values/airflow-values.yaml
index b574ff4..530a765 100644
--- a/installers/helm/values/airflow-values.yaml
+++ b/installers/helm/values/airflow-values.yaml
@@ -13,7 +13,7 @@
#
---
defaultAirflowRepository: opensourcemano/airflow
-defaultAirflowTag: "testing-daily"
+defaultAirflowTag: "14"
webserverSecretKeySecretName: airflow-webserver-secret
webserver:
service:
diff --git a/installers/install_ngsa.sh b/installers/install_ngsa.sh
index 8f18f03..ed653c7 100755
--- a/installers/install_ngsa.sh
+++ b/installers/install_ngsa.sh
@@ -85,7 +85,7 @@
DOCKER_REGISTRY_URL=
DOCKER_USER="opensourcemano"
OSM_DEVOPS="/usr/share/osm-devops"
-OSM_DOCKER_TAG="13"
+OSM_DOCKER_TAG="14"
OSM_HELM_WORK_DIR="/etc/osm/helm"
while getopts ":D:d:t:r:U:-: " o; do
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 5fca648..7adc9e1 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=ReleaseTHIRTEEN
+RELEASE=ReleaseFOURTEEN
REPOSITORY=stable
-DOCKER_TAG=13
+DOCKER_TAG=14
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 c94b80a..3b5f214 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -531,7 +531,7 @@
]
sshCommand remote: remote, command: '''
- wget https://osm-download.etsi.org/ftp/osm-13.0-thirteen/install_osm.sh
+ wget https://osm-download.etsi.org/ftp/osm-14.0-fourteen/install_osm.sh
chmod +x ./install_osm.sh
sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc
'''
diff --git a/tools/env-ftp b/tools/env-ftp
index 156fc9c..40a5ee9 100644
--- a/tools/env-ftp
+++ b/tools/env-ftp
@@ -17,7 +17,7 @@
#######################################################################################
SERVER="ftp://osm-download.etsi.org"
-FOLDER="osm-13.0-thirteen"
+FOLDER="osm-14.0-fourteen"
FTP_OPTS=""
# Define your FTP credentials in a separate (private file)