[VOL-2778] Support for the new BBSim parameter in the scale job an preliminary TT job

Change-Id: Ic0b473b07c94fe8b58f03edcf33d9fafe97fd1d9
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index a9b10c5..54ac693 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -118,7 +118,7 @@
           sh(script:"""
           if [ '${kindVolthaChange}' != '' ] ; then
           cd $WORKSPACE/kind-voltha;
-          git fetch https://gerrit.opencord.org/kind-voltha ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+          git fetch https://gerrit.opencord.org/kind-voltha ${kindVolthaChange} && git checkout FETCH_HEAD
           fi
           """)
         }
@@ -228,6 +228,11 @@
             echo "Installing with the following extra arguments:"
             echo $EXTRA_HELM_FLAGS
 
+            # if it's master set the correct BBSIM_CFG
+            if [ '${release.trim()}' == 'master' ]; then
+              export BBSIM_CFG="$WORKSPACE/kind-voltha/configs/bbsim-sadis-${workflow}.yaml"
+            fi
+
             ./voltha up
 
             # Forward the ETCD port onto $VOLTHA_ETCD_PORT