Prepare installer, pods and Jenkins for Rel THIRTEEN
Change-Id: Id7bc562963acdb8facf7c6fb48e9598f0743d92f
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 64d9500..630b364 100644
--- a/installers/docker/osm_pla/pla.yaml
+++ b/installers/docker/osm_pla/pla.yaml
@@ -39,7 +39,7 @@
command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"]
containers:
- name: pla
- image: opensourcemano/pla:12
+ image: opensourcemano/pla:13
env:
- name: OSMPLA_DATABASE_HOST
value: mongo
diff --git a/installers/docker/osm_pods/keystone.yaml b/installers/docker/osm_pods/keystone.yaml
index 00e565d..43def3c 100644
--- a/installers/docker/osm_pods/keystone.yaml
+++ b/installers/docker/osm_pods/keystone.yaml
@@ -46,7 +46,7 @@
spec:
containers:
- name: keystone
- image: opensourcemano/keystone:12
+ image: opensourcemano/keystone:13
ports:
- containerPort: 5000
protocol: TCP
diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml
index 6fc5402..5472518 100644
--- a/installers/docker/osm_pods/lcm.yaml
+++ b/installers/docker/osm_pods/lcm.yaml
@@ -41,7 +41,7 @@
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:12
+ image: opensourcemano/lcm:13
env:
- name: OSMLCM_RO_HOST
value: ro
diff --git a/installers/docker/osm_pods/mon.yaml b/installers/docker/osm_pods/mon.yaml
index b803724..24e2004 100644
--- a/installers/docker/osm_pods/mon.yaml
+++ b/installers/docker/osm_pods/mon.yaml
@@ -50,7 +50,7 @@
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:12
+ image: opensourcemano/mon:13
ports:
- containerPort: 8662
protocol: TCP
diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml
index 0664695..728362b 100644
--- a/installers/docker/osm_pods/nbi.yaml
+++ b/installers/docker/osm_pods/nbi.yaml
@@ -54,7 +54,7 @@
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:12
+ image: opensourcemano/nbi:13
ports:
- containerPort: 9999
protocol: TCP
diff --git a/installers/docker/osm_pods/ng-prometheus.yaml b/installers/docker/osm_pods/ng-prometheus.yaml
index ebef7a9..98dd1e8 100644
--- a/installers/docker/osm_pods/ng-prometheus.yaml
+++ b/installers/docker/osm_pods/ng-prometheus.yaml
@@ -140,7 +140,7 @@
- name: prom-db
mountPath: /prometheus
- name: prometheus-config-sidecar
- image: opensourcemano/prometheus:12
+ image: opensourcemano/prometheus:13
env:
- name: MONGODB_URL
value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
diff --git a/installers/docker/osm_pods/ng-ui.yaml b/installers/docker/osm_pods/ng-ui.yaml
index 40c9e5d..6c15337 100644
--- a/installers/docker/osm_pods/ng-ui.yaml
+++ b/installers/docker/osm_pods/ng-ui.yaml
@@ -46,7 +46,7 @@
spec:
containers:
- name: ng-ui
- image: opensourcemano/ng-ui:12
+ image: opensourcemano/ng-ui:13
ports:
- containerPort: 80
protocol: TCP
diff --git a/installers/docker/osm_pods/pol.yaml b/installers/docker/osm_pods/pol.yaml
index 9c852c5..9b3754a 100644
--- a/installers/docker/osm_pods/pol.yaml
+++ b/installers/docker/osm_pods/pol.yaml
@@ -40,7 +40,7 @@
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:12
+ image: opensourcemano/pol:13
env:
- name: OSMPOL_MESSAGE_HOST
value: kafka
diff --git a/installers/docker/osm_pods/prometheus.yaml b/installers/docker/osm_pods/prometheus.yaml
index 241ed72..a914ea5 100644
--- a/installers/docker/osm_pods/prometheus.yaml
+++ b/installers/docker/osm_pods/prometheus.yaml
@@ -127,7 +127,7 @@
- name: prom-db
mountPath: /prometheus
- name: prometheus-config-sidecar
- image: opensourcemano/prometheus:12
+ image: opensourcemano/prometheus:13
env:
- name: MONGODB_URL
value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
diff --git a/installers/docker/osm_pods/ro.yaml b/installers/docker/osm_pods/ro.yaml
index af593a8..9885169 100644
--- a/installers/docker/osm_pods/ro.yaml
+++ b/installers/docker/osm_pods/ro.yaml
@@ -50,7 +50,7 @@
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:12
+ image: opensourcemano/ro:13
ports:
- containerPort: 9090
protocol: TCP
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index d74cf00..3b57a97 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -557,7 +557,7 @@
list_of_services="$list_of_services $module"
fi
done
- if [ ! "$OSM_DOCKER_TAG" == "12" ]; then
+ if [ ! "$OSM_DOCKER_TAG" == "13" ]; then
parse_yaml $OSM_DOCKER_TAG $list_of_services
fi
if [ -n "$MODULE_DOCKER_TAG" ]; then
@@ -823,7 +823,7 @@
add_local_k8scluster
track final_ops add_local_k8scluster_ok
- wget -q -O- https://osm-download.etsi.org/ftp/osm-12.0-twelve/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null
track end
sudo find /etc/osm
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -1227,7 +1227,7 @@
track start release $RELEASE none none docker_tag $OSM_DOCKER_TAG none none installation_type $OSM_INSTALLATION_TYPE none none
${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-12.0-twelve/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null
track end installation_type $OSM_INSTALLATION_TYPE
echo -e "\nDONE"
exit 0
@@ -1252,7 +1252,7 @@
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
-wget -q -O- https://osm-download.etsi.org/ftp/osm-12.0-twelve/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README.txt &> /dev/null
export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)"
install_osm
echo -e "\nDONE"
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 11ce0be..e8526a8 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=ReleaseTWELVE
+RELEASE=ReleaseTHIRTEEN
REPOSITORY=stable
-DOCKER_TAG=12
+DOCKER_TAG=13
DEVOPS_PATH=/usr/share/osm-devops
function usage(){