Fix job fail problem
1. Added 1/1 to tiller-pod grep to avoid tiller is not ready yet.
2. set the wowz namespace pod to correct number
Change-Id: If969d18f27c3d2a028598f1d8439a69d6dcc6e29
diff --git a/Jenkinsfile-mcord-remote-build b/Jenkinsfile-mcord-remote-build
index 22568bc..b24a47d 100644
--- a/Jenkinsfile-mcord-remote-build
+++ b/Jenkinsfile-mcord-remote-build
@@ -34,7 +34,7 @@
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
+ kubectl -n kube-system get pods | grep tiller-deploy | grep Running | grep 1/1 | wc -l
"""
return tillerpod_running.toInteger() == 1
}
@@ -48,6 +48,7 @@
helm delete --purge "\${hchart}"
done
"""
+
timeout(5) {
waitUntil {
helm_deleted = sh returnStdout: true, script: """
@@ -124,7 +125,7 @@
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
kubectl -n wowz get pods -o wide | grep -i running | grep 1/1 | wc -l
"""
- return mcord_remote_cdn_working.toInteger() == 1
+ return mcord_remote_cdn_working.toInteger() == 2
}
}
}