update to container/pod count to builds
Change-Id: Ia66498c5213e174dcf76e0f561d24efb8981ba42
diff --git a/Jenkinsfile-attworkflow-build-released-ver b/Jenkinsfile-attworkflow-build-released-ver
index 9bb11de..547aa69 100644
--- a/Jenkinsfile-attworkflow-build-released-ver
+++ b/Jenkinsfile-attworkflow-build-released-ver
@@ -18,6 +18,7 @@
stage ("Parse deployment configuration file") {
sh returnStdout: true, script: "rm -rf ${configBaseDir}"
sh returnStdout: true, script: "git clone -b ${branch} ${cordRepoUrl}/${configBaseDir}"
+ sh returnStdout: true, script: "git clone -b ${branch} ${cordRepoUrl}/helm-repo-tools"
deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
}
stage('Clean up') {
@@ -115,13 +116,10 @@
stage('Check containers are running') {
timeout(20) {
waitUntil {
- pods_running = sh returnStdout: true, script: """
+ sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
- kubectl get pods --all-namespaces | grep -i running | grep -E -v 'docker-registry|mavenrepo|ponnet|kube-system' | wc -l
+ helm-repo-tools/wait_for_pods.sh
"""
- return pods_running.toInteger() == 51
- }
- waitUntil {
pods_completed = sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
kubectl get pods --all-namespaces | grep -i completed | grep -E -v 'docker-registry|mavenrepo|ponnet|kube-system' | wc -l