Merge "When localChart is set in a VOLTHA deployment, use the local BBSim chart as well"
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index b7e43fc..9e27d33 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -19,9 +19,11 @@
     def cfg = defaultConfig + config
 
     def volthaStackChart = "onf/voltha-stack"
+    def bbsimChart = "onf/bbsim"
 
     if (cfg.localCharts) {
       volthaStackChart = "$WORKSPACE/voltha-helm-charts/voltha-stack"
+      bbsimChart = "$WORKSPACE/voltha-helm-charts/bbsim"
 
       sh """
       pushd $WORKSPACE/voltha-helm-charts/voltha-stack
@@ -62,7 +64,7 @@
       }
 
       sh """
-        helm upgrade --install --create-namespace -n ${cfg.volthaNamespace} bbsim${i} onf/bbsim \
+        helm upgrade --install --create-namespace -n ${cfg.volthaNamespace} bbsim${i} ${bbsimChart} \
         --set olt_id="${cfg.stackId}${i}" \
         -f $WORKSPACE/bbsimCfg${cfg.stackId}${i}.yaml \
         ${cfg.extraHelmFlags}