Moving helm-init to the top of clean up
Otherwise we won't able to use `helm ls` when clean-up
Change-Id: Id10eaa820bfd54f047e879993cd3f002dac61d2e
diff --git a/Jenkinsfile-mcord-local-build b/Jenkinsfile-mcord-local-build
index 609080f..af41935 100644
--- a/Jenkinsfile-mcord-local-build
+++ b/Jenkinsfile-mcord-local-build
@@ -26,6 +26,21 @@
timeout(10) {
sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
+ helm init --upgrade --force-upgrade
+ """
+
+ timeout(1) {
+ waitUntil {
+ tillerpod_running = sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
+ kubectl -n kube-system get pods | grep tiller-deploy | grep Running | wc -l
+ """
+ return tillerpod_running.toInteger() == 1
+ }
+ }
+
+ sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet');
do
echo "Purging chart: \${hchart}"
@@ -136,7 +151,6 @@
stage('Add Helm repositories') {
sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- helm init --upgrade --force-upgrade
helm repo add cord https://charts.opencord.org
helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
helm repo update
diff --git a/Jenkinsfile-mcord-remote-build b/Jenkinsfile-mcord-remote-build
index 5673a80..22568bc 100644
--- a/Jenkinsfile-mcord-remote-build
+++ b/Jenkinsfile-mcord-remote-build
@@ -27,6 +27,21 @@
timeout(10) {
sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
+ helm init --upgrade --force-upgrade
+ """
+
+ timeout(1) {
+ waitUntil {
+ tillerpod_running = sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
+ kubectl -n kube-system get pods | grep tiller-deploy | grep Running | wc -l
+ """
+ return tillerpod_running.toInteger() == 1
+ }
+ }
+
+ sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet');
do
echo "Purging chart: \${hchart}"
@@ -56,7 +71,6 @@
stage('Add Helm repositories') {
sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- helm init --upgrade --force-upgrade
helm repo add cord https://charts.opencord.org
helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
helm repo update