commit 992377e67789529d93749c64651d0b6fb0b2c62e
author Suchitra Vemuri <suchitra@opennetworking.org> Sat Jun 20 18:03:49 2020 -0700
committer Suchitra Vemuri <suchitra@opennetworking.org> Sat Jun 20 18:03:53 2020 -0700
tree c7fad2f05772d125dcddd2a60b6e0b93d1526b51
parent 690ce43a316d5a738de6900bddc8cabdf07b55c6

[VOL-3259] Changes to build script

Change-Id: I0c2a0ea2202bc94699cd58d79dfd0fe24f68b88b

Jenkinsfile-voltha-build

diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 029a32d..98cbb0f 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -152,8 +152,8 @@
                             etcd_container=\$(kubectl get pods | grep etcd | awk 'NR==1{print \$1}')
                             kubectl cp $WORKSPACE/voltha-system-tests/tests/data/TechProfile-${profile}.json \$etcd_container:/tmp/flexpod.json
                             put_result=\$(kubectl exec -it \$etcd_container -- /bin/sh -c 'cat /tmp/flexpod.json | ETCDCTL_API=3 etcdctl put service/voltha/technology_profiles/${tech_prof_directory}/64')
-                            kubectl cp $WORKSPACE/voltha-system-tests/tests/data/MIB_Alpha.json \$etcd_container:/tmp/MIB_Alpha.json
-                            put_result=\$(kubectl exec -it \$etcd_container -- /bin/sh -c 'cat /tmp/MIB_Alpha.json | ETCDCTL_API=3 etcdctl put service/voltha/omci_mibs/templates/BRCM/BVM4K00BRA0915-0083/5023_020O02414')
+                            //kubectl cp $WORKSPACE/voltha-system-tests/tests/data/MIB_Alpha.json \$etcd_container:/tmp/MIB_Alpha.json
+                            //put_result=\$(kubectl exec -it \$etcd_container -- /bin/sh -c 'cat /tmp/MIB_Alpha.json | ETCDCTL_API=3 etcdctl put service/voltha/omci_mibs/templates/BRCM/BVM4K00BRA0915-0083/5023_020O02414')
                             //kubectl cp $WORKSPACE/voltha-system-tests/tests/data/MIB_Iskratel.json \$etcd_container:/tmp/MIB_Iskratel.json
                             //put_result=\$(kubectl exec -it \$etcd_container -- /bin/sh -c 'cat /tmp/MIB_Iskratel.json | ETCDCTL_API=3 etcdctl put service/voltha/omci_mibs/templates/BRCM/G108_10/7.0.1b8-0.6')
                             """
@@ -173,6 +173,10 @@
             stage('Push Sadis-config') {
                 timeout(1) {
                     sadis_out = sh returnStatus: true, script: """
+                    export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
+                    etcd_container=\$(kubectl get pods | grep etcd | awk 'NR==1{print \$1}')
+                    kubectl cp $WORKSPACE/voltha-system-tests/tests/data/MIB_Alpha.json \$etcd_container:/tmp/MIB_Alpha.json
+                    put_result=\$(kubectl exec -it \$etcd_container -- /bin/sh -c 'cat /tmp/MIB_Alpha.json | ETCDCTL_API=3 etcdctl put service/voltha/omci_mibs/templates/BRCM/BVM4K00BRA0915-0083/5023_020O02414')
                     if [[ "${workFlow}" == "DT" ]]; then
                         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-DT.json
                     else
@@ -275,6 +279,7 @@
                                 throw new Exception("Upstream port for the olt is not configured, field aggPort is empty")
                             }
                             xconnect_out = sh returnStatus: true, script: """
+                            sleep 30
                             version=\$(sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "summary" | grep version)
                             sleep 10
                             if [[ \$version == *"version=2.2"* ]]; then