[VOL-3780] Removing charts from default, voltha and infra namespaces
Change-Id: Id974d0d4d2920c255ca976bb7eac4db64a504ff5
(cherry picked from commit e47ca4fc0c1ae245d4b34c6d6fa3b77f94f8cc34)
diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 5f2c5cc..cb2f59f 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -45,27 +45,15 @@
sh returnStdout: true, script: """
echo "cleaning up"
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- HELM_MAJOR=\$(helm version --client --short | sed -E -e 's/^.*v([0-9]+)\\.[0-9]+\\.[0-9]+.*\$/\\1/')
- for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet|local-path-storage|cattle');
+ NAMESPACES="voltha infra default"
+ for NS in \$NAMESPACES
do
- echo "Purging chart: \${hchart}"
- if [ \$HELM_MAJOR -le 2 ]; then
- helm delete --purge "\${hchart}"
- else
- helm uninstall "\${hchart}"
- fi
- done
- if [ \$HELM_MAJOR -gt 2 ]; then
- for hchart in \$(helm list -q -n voltha | grep -E -v 'docker-registry|mavenrepo|ponnet|local-path-storage|cattle');
+ for hchart in \$(helm list -n $NS -q | grep -E -v 'docker-registry|kafkacat');
do
echo "Purging chart: \${hchart}"
- if [ \$HELM_MAJOR -le 2 ]; then
- helm delete --purge "\${hchart}"
- else
- helm uninstall -n voltha "\${hchart}"
- fi
+ helm delete -n \$NS "\${hchart}"
done
- fi
+ done
"""
timeout(5) {
waitUntil {
diff --git a/VERSION b/VERSION
index 745ec0d..097a15a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.2-dev
+2.6.2