updating installation of cord-kafka in build scripts
Change-Id: If54772d2dc49b22ad147ac48572d2b9113b3f3be
diff --git a/Jenkinsfile-attworkflow-build b/Jenkinsfile-attworkflow-build
index c7b080b..ab88054 100644
--- a/Jenkinsfile-attworkflow-build
+++ b/Jenkinsfile-attworkflow-build
@@ -57,7 +57,8 @@
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
+ helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
+ helm install -f examples/kafka-single.yaml --version 0.8.8 -n voltha-kafka incubator/kafka
"""
}
timeout(10) {
@@ -94,7 +95,7 @@
timeout(10) {
sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- helm install --name cord-kafka --set replicas=1 --set persistence.enabled=false --set zookeeper.replicaCount=1 --set zookeeper.persistence.enabled=false incubator/kafka
+ helm install -f examples/kafka-single.yaml --version 0.8.8 -n cord-kafka incubator/kafka
"""
}
timeout(10) {
@@ -235,7 +236,7 @@
}
}
if ( params.configurePod ) {
- dir ("${configBaseDir}/${configToscaDir}/attworkflow-configs") {
+ dir ("${configBaseDir}/${configToscaDir}/att-workflow") {
stage('Configure R-CORD - Fabric and whitelist') {
timeout(1) {
waitUntil {
diff --git a/Jenkinsfile-rcordlite-topdown-build b/Jenkinsfile-rcordlite-topdown-build
index 10f5e44..4db8bc0 100644
--- a/Jenkinsfile-rcordlite-topdown-build
+++ b/Jenkinsfile-rcordlite-topdown-build
@@ -57,7 +57,8 @@
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
+ helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
+ helm install -f examples/kafka-single.yaml --version 0.8.8 -n voltha-kafka incubator/kafka
"""
}
timeout(10) {
@@ -90,6 +91,23 @@
}
}
}
+ stage('Install CORD Kafka') {
+ timeout(10) {
+ sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
+ helm install -f examples/kafka-single.yaml --version 0.8.8 -n cord-kafka incubator/kafka
+ """
+ }
+ timeout(10) {
+ waitUntil {
+ kafka_instances_running = sh returnStdout: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
+ kubectl get pods | grep cord-kafka | grep -i running | grep 1/1 | wc -l
+ """
+ return kafka_instances_running.toInteger() == 2
+ }
+ }
+ }
stage('Install ONOS') {
timeout(10) {
sh returnStdout: true, script: """
diff --git a/Jenkinsfile-rcordlite-zerotouch-build b/Jenkinsfile-rcordlite-zerotouch-build
index 58945dc..d3f5482 100644
--- a/Jenkinsfile-rcordlite-zerotouch-build
+++ b/Jenkinsfile-rcordlite-zerotouch-build
@@ -57,7 +57,8 @@
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
+ helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
+ helm install -f examples/kafka-single.yaml --version 0.8.8 -n voltha-kafka incubator/kafka
"""
}
timeout(10) {