Fixing zero touch and push down in cord-6.0
Change-Id: I2dafe669fdf3b91f7d9ccc4e49b9c89f1cdcc849
diff --git a/Jenkinsfile-rcordlite-topdown b/Jenkinsfile-rcordlite-topdown
index dd82fad..cf47d4e 100644
--- a/Jenkinsfile-rcordlite-topdown
+++ b/Jenkinsfile-rcordlite-topdown
@@ -53,6 +53,23 @@
}
}
dir ("helm-charts") {
+ stage('Install Voltha Kafka') {
+ timeout(10) {
+ sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
+ helm install --name voltha-kafka --set replicas=1 --set persistence.enabled=false --set zookeeper.replicaCount=1 --set zookeeper.persistence.enabled=false incubator/kafka
+ """
+ }
+ timeout(10) {
+ waitUntil {
+ kafka_instances_running = sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
+ kubectl get pods | grep voltha-kafka | grep -i running | grep 1/1 | wc -l
+ """
+ return kafka_instances_running.toInteger() == 2
+ }
+ }
+ }
stage('Install voltha') {
timeout(10) {
sh returnStdout: true, script: """
@@ -69,7 +86,7 @@
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
kubectl get pods -n voltha | grep -i running | grep 1/1 | wc -l
"""
- return voltha_completed.toInteger() == 12
+ return voltha_completed.toInteger() == 11
}
}
}
diff --git a/Jenkinsfile-rcordlite-zerotouch b/Jenkinsfile-rcordlite-zerotouch
index cedaf5b..8ab2528 100644
--- a/Jenkinsfile-rcordlite-zerotouch
+++ b/Jenkinsfile-rcordlite-zerotouch
@@ -86,7 +86,7 @@
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
kubectl get pods -n voltha | grep -i running | grep 1/1 | wc -l
"""
- return voltha_completed.toInteger() == 12
+ return voltha_completed.toInteger() == 11
}
}
}