updates to stages in the build job
Change-Id: Idbed8382b63f3cf3c0155da76bc9527d1c1549ec
diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 5d5db04..2f058d8 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -63,6 +63,33 @@
"""
}
}
+ if ( params.configurePod )
+ stage('Push Tech-Profile') {
+ timeout(1) {
+ out_push_tp = sh returnStatus: true, script: """
+ export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
+ etcd_container=\$(kubectl get pods -n voltha | grep voltha-etcd-cluster | awk 'NR==1{print \$1}')
+ kubectl cp /home/cord/voltha-system-tests/tests/data/${configFileName}-multipleGem.json voltha/\$etcd_container:/tmp/flexpod.json
+ put_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'cat /tmp/flexpod.json | ETCDCTL_API=3 etcdctl put service/voltha/technology_profiles/xgspon/64')
+ """
+ return out_push_tp == 0
+ }
+ timeout(1) {
+ out_get_tp = sh returnStatus: true, script: """
+ etcd_container=\$(kubectl get pods -n voltha | grep voltha-etcd-cluster | awk 'NR==1{print \$1}')
+ get_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'ETCDCTL_API=3 etcdctl get --prefix service/voltha/technology_profiles/xgspon/64')
+ """
+ return out_get_tp == 0
+ }
+ }
+ stage('Push Sadis-config') {
+ timeout(1) {
+ sadis_out = sh returnStatus: true, script: """
+ curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-sadis.json
+ """
+ return sadis_out == 0
+ }
+ }
if ( params.reinstallOlt ) {
stage('Reinstall OLT software') {
@@ -148,34 +175,6 @@
}
}
}
- if ( params.configurePod ) {
- stage('Push Tech-Profile') {
- timeout(1) {
- out_push_tp = sh returnStatus: true, script: """
- export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- etcd_container=\$(kubectl get pods -n voltha | grep voltha-etcd-cluster | awk 'NR==1{print \$1}')
- kubectl cp /home/cord/voltha-system-tests/tests/data/${configFileName}-multipleGem.json voltha/\$etcd_container:/tmp/flexpod.json
- put_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'cat /tmp/flexpod.json | ETCDCTL_API=3 etcdctl put service/voltha/technology_profiles/xgspon/64')
- """
- return out_push_tp == 0
- }
- timeout(1) {
- out_get_tp = sh returnStatus: true, script: """
- etcd_container=\$(kubectl get pods -n voltha | grep voltha-etcd-cluster | awk 'NR==1{print \$1}')
- get_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'ETCDCTL_API=3 etcdctl get --prefix service/voltha/technology_profiles/xgspon/64')
- """
- return out_get_tp == 0
- }
- }
- stage('Push Sadis-config') {
- timeout(1) {
- sadis_out = sh returnStatus: true, script: """
- curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-sadis.json
- """
- return sadis_out == 0
- }
- }
- }
currentBuild.result = 'SUCCESS'
} catch (err) {
currentBuild.result = 'FAILURE'