commit da9b6569239cc7ac101079d0f211f974a297e6cd
author Kailash <kailash@onlab.us> Tue Sep 03 12:48:31 2019 -0700
committer Kailash <kailash@onlab.us> Tue Sep 03 12:48:31 2019 -0700
tree b97eac01dc8b22317e6cfd6940927fec4019c060
parent c7b05c7e08d6552fd2efa4fffa2fdbded4c80af4

voltha-bbsim-system test fixes

Change-Id: Ibe2cb26aca5b3d1f81020fd4315d86de321c5822

jjb/pipeline/voltha-bbsim-tests.groovy

diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 93f10f8..c64b90b 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -83,7 +83,7 @@
            export TYPE=minimal
            export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
            export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
-           export PATH=/w/workspace/voltha-go-e2e-tests/kind-voltha/bin:$PATH
+           export PATH=/w/workspace/voltha-bbsim-system-tests/kind-voltha/bin:$PATH
            docker images | grep citest
            for image in \$(docker images -f "reference=*/*citest" --format "{{.Repository}}"); do echo "Pushing \$image to nodes"; kind load docker-image \$image:citest --name voltha-\$TYPE --nodes voltha-\$TYPE-worker,voltha-\$TYPE-worker2; done
            '''
@@ -107,7 +107,8 @@
            fi
 
            cd kind-voltha/
-           EXTRA_HELM_FLAGS='\${HELM_FLAG}' VOLTHA_LOG_LEVEL=DEBUG TYPE=minimal WITH_RADIUS=y WITH_BBSIM=y INSTALL_ONOS_APPS=y CONFIG_SADIS=y FANCY=0 ./voltha up
+           echo \$HELM_FLAG
+           EXTRA_HELM_FLAGS=\$HELM_FLAG VOLTHA_LOG_LEVEL=DEBUG TYPE=minimal WITH_RADIUS=y WITH_BBSIM=y INSTALL_ONOS_APPS=y CONFIG_SADIS=y FANCY=0 ./voltha up
            """
       }
     }
@@ -118,7 +119,7 @@
            cd kind-voltha/
            export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
            export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
-           export PATH=/w/workspace/voltha-go-e2e-tests/kind-voltha/bin:$PATH
+           export PATH=/w/workspace/voltha-bbsim-system-tests/kind-voltha/bin:$PATH
            cd $WORKSPACE/voltha-system-tests/tests/sanity
            robot -e notready --critical sanity --noncritical VOL-1705 -v num_onus:1 sanity.robot || true
            '''
@@ -136,7 +137,7 @@
          cp install-minimal.log $WORKSPACE/
          export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
          export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
-         export PATH=/w/workspace/voltha-go-e2e-tests/kind-voltha/bin:$PATH
+         export PATH=/w/workspace/voltha-bbsim-system-tests/kind-voltha/bin:$PATH
          kubectl get pods --all-namespaces -o jsonpath="{..image}" |tr -s "[[:space:]]" "\n" | sort | uniq -c
          kubectl get nodes -o wide
          kubectl get pods -o wide