[VOL-3780] Migrating voltha-scale multi-stack pipeline to helm-charts

Change-Id: I1ba767d23fdf49fdd87cb19dded3214532f0ab1e
diff --git a/vars/volthaDeploy.groovy b/vars/volthaDeploy.groovy
index eb9faca..45e214d 100644
--- a/vars/volthaDeploy.groovy
+++ b/vars/volthaDeploy.groovy
@@ -11,6 +11,8 @@
       bbsimReplica: 1,
       infraNamespace: "infra",
       volthaNamespace: "voltha",
+      stackName: "voltha",
+      stackId: 1,
       workflow: "att",
       extraHelmFlags: "",
     ]
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 78d90bf..c68de53 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -2,14 +2,11 @@
 def call(Map config) {
     // note that I can't define this outside the function as there's no global scope in Groovy
     def defaultConfig = [
-      onosReplica: 1,
-      atomixReplica: 1,
-      kafkaReplica: 1,
-      etcdReplica: 1,
       bbsimReplica: 1,
       infraNamespace: "infra",
       volthaNamespace: "voltha",
       stackName: "voltha",
+      stackId: 1, // NOTE this is used to differentiate between BBSims across multiple stacks
       workflow: "att",
       extraHelmFlags: "",
     ]
@@ -33,7 +30,7 @@
       // TODO differentiate olt_id between different stacks
        sh """
          helm upgrade --install --create-namespace -n ${cfg.volthaNamespace} bbsim${i} onf/bbsim ${cfg.extraHelmFlags} \
-         --set olt_id="1${i}" \
+         --set olt_id="${cfg.stackId}${i}" \
          -f $WORKSPACE/voltha-helm-charts/examples/${cfg.workflow}-values.yaml
        """
     }