From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 6 Jun 2023 16:56:32 +0000 (+0200)
Subject: Fix errors in installation tracking related to proxy_ok and install_k8s_ok
X-Git-Tag: release-v14.0-start~29
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b17abf76811b74f98bd5852d6ce4010a4acb680a;p=osm%2Fdevops.git

Fix errors in installation tracking related to proxy_ok and install_k8s_ok

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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 943a0804..3ca7db7a 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -495,7 +495,6 @@ function install_osm() {
     [ -n "$DOCKER_REGISTRY_URL" ] && parse_docker_registry_url
 
     check_osm_behind_proxy
-    track checks proxy_ok
 
     check_packages "git wget curl tar snapd"
 
@@ -566,7 +565,7 @@ function install_osm() {
     track docker_images docker_images_ok
 
     deploy_charmed_services
-    track deploy_osm deploy_charmed_services_ok
+    track deploy_osm deploy_mongodb_ok
     deploy_osm_services
     track deploy_osm deploy_osm_services_k8s_ok
     if [ -n "$INSTALL_K8S_MONITOR" ]; then
diff --git a/installers/install_kubeadm_cluster.sh b/installers/install_kubeadm_cluster.sh
index 0459bed5..d57dec7f 100755
--- a/installers/install_kubeadm_cluster.sh
+++ b/installers/install_kubeadm_cluster.sh
@@ -46,7 +46,7 @@ function check_and_track_kube_install() {
     [ -n "${kubeadm_version}" ] || FATAL_TRACK k8scluster "Kubeadm was not installed."
     kubectl_version=$(dpkg -s kubectl|grep Version|awk '{print $2}')
     [ -n "${kubectl_version}" ] || FATAL_TRACK k8scluster "Kubectl was not installed."
-    track k8scluster install_k8s_ok kubelet ${kubelet_version} none none kubeadm ${kubeadm_version} none none kubectl ${kubectl_version} none none
+    track k8scluster install_k8s_ok none none none kubelet ${kubelet_version} none none kubeadm ${kubeadm_version} none none kubectl ${kubectl_version} none none
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }