diff --git a/jjb/build_openolt_deb.yaml b/jjb/build_openolt_deb.yaml
index e1b8cf6..9cc5408 100644
--- a/jjb/build_openolt_deb.yaml
+++ b/jjb/build_openolt_deb.yaml
@@ -30,12 +30,6 @@
           build-days-to-keep: '{build-days-to-keep}'
           artifact-num-to-keep: '{artifact-num-to-keep}'
 
-    parameters:
-      - string:
-          name: notificationEmail
-          default: 'shad@opennetworking.org kailash@opennetworking.org'
-          description: ''
-
     node: 'qct-pod3-node2'
 
     project-type: pipeline
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index be17049..84428df 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -82,11 +82,6 @@
           default: '{profile}'
           description: 'Profile in which this job installs'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
       - bool:
           name: installMonitoringAndLogging
           default: false
@@ -252,11 +247,6 @@
           description: "Onus per PonPort"
 
       - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
-      - string:
           name: openoltAdapterChart
           default: '{openoltAdapterChart}'
           description: 'OpenOLT chart name (or location on file system)'
@@ -334,11 +324,6 @@
           name: branch
           default: '{branch}'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
     concurrent: true
 
     pipeline-scm:
@@ -415,11 +400,6 @@
           name: branch
           default: '{branch}'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
       - bool:
           name: configurePod
           default: true
@@ -516,11 +496,6 @@
           name: branch
           default: '{branch}'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
       - bool:
           name: configurePod
           default: true
@@ -612,11 +587,6 @@
           name: branch
           default: '{branch}'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
     concurrent: true
 
     pipeline-scm:
@@ -689,11 +659,6 @@
           name: branch
           default: '{branch}'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
     concurrent: true
 
     pipeline-scm:
@@ -771,11 +736,6 @@
           default: '{profile}'
           description: 'Profile in which this job installs'
 
-      - string:
-          name: notificationEmail
-          default: 'luca@opennetworking.org, teo@opennetworking.org, weiyu@opennetworking.org'
-          description: ''
-
       - bool:
           name: configurePod
           default: true
diff --git a/jjb/pipeline/mcord-build-test.groovy b/jjb/pipeline/mcord-build-test.groovy
index a5ebb66..8d2269e 100644
--- a/jjb/pipeline/mcord-build-test.groovy
+++ b/jjb/pipeline/mcord-build-test.groovy
@@ -132,7 +132,6 @@
           sh (script: "ssh -oStrictHostKeyChecking=no -i ~/.ssh/cord ubuntu@${node_ip} 'export OS_CLOUD=openstack_helm; openstack server list --all-projects 1>&2'", returnStdout: true)
 
           }
-          step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
-     }
+       }
     }
 }
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 5d7c5e7..241d5d9 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -324,8 +324,5 @@
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz,etcd/*.log'
     }
-    unstable {
-      step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
-    }
   }
 }
diff --git a/jjb/pipeline/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
index 50fa092..2a0902f 100644
--- a/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
@@ -294,8 +294,5 @@
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz,etcd/*.log'
     }
-    unstable {
-      step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
-    }
   }
 }
diff --git a/jjb/pipeline/voltha-physical-soak-tests.groovy b/jjb/pipeline/voltha-physical-soak-tests.groovy
index 1ec68bd..4bb8b02 100644
--- a/jjb/pipeline/voltha-physical-soak-tests.groovy
+++ b/jjb/pipeline/voltha-physical-soak-tests.groovy
@@ -230,8 +230,5 @@
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz,etcd/*.log'
     }
-    unstable {
-      step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
-    }
   }
 }
diff --git a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
index 3238fcd..e7250aa 100644
--- a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
@@ -311,8 +311,5 @@
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz'
     }
-    unstable {
-      step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
-    }
   }
 }
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 9a1b304..0173ea8 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -323,9 +323,6 @@
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.FlowObjectiveManager numThreads ${flowObjWorkerThreads}
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.InOrderFlowObjectiveManager objectiveTimeoutMs 300000
 
-          #SR is not needed in scale tests and not currently used by operators in production, can be disabled.
-          sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 app deactivate org.onosproject.segmentrouting
-
           if [ ${withFlows} = false ]; then
             sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 app deactivate org.opencord.olt
           fi
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
index 85e32e4..a6d7be1 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
@@ -237,10 +237,8 @@
 
             println "Passing the following parameters to the VOLTHA infra deploy: ${infraHelmFlags}."
 
-            def localCharts = false
-            if (volthaHelmChartsChange != "" || branch != "master") {
-              localCharts = true
-            }
+            // in a released version we always want to use the local version of the helm-charts
+            def localCharts = true
 
             volthaInfraDeploy([
               workflow: workflow,
@@ -323,9 +321,6 @@
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.FlowObjectiveManager numThreads ${flowObjWorkerThreads}
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.InOrderFlowObjectiveManager objectiveTimeoutMs 300000
 
-          #SR is not needed in scale tests and not currently used by operators in production, can be disabled.
-          sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 app deactivate org.onosproject.segmentrouting
-
           if [ ${withFlows} = false ]; then
             sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 app deactivate org.opencord.olt
           fi
diff --git a/jjb/pipeline/xos-integration-tests.groovy b/jjb/pipeline/xos-integration-tests.groovy
index 5874c43..42eb8ad 100644
--- a/jjb/pipeline/xos-integration-tests.groovy
+++ b/jjb/pipeline/xos-integration-tests.groovy
@@ -201,7 +201,6 @@
             reportFileName: 'RobotLogs/report*.html',
             unstableThreshold: 0]);
          archiveArtifacts artifacts: '*.log'
-         step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${params.notificationEmail}", sendToIndividuals: false])
 
     }
   }
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index a5c90cf..fea3a4b 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -10,7 +10,7 @@
           branch-regexp: '{all-branches-regexp}'
       - 'verify-bbsim-sadis-server-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-bbsim-sadis-server-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-sadis-server-jobs':
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 3d99840..3b64b88 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -11,7 +11,7 @@
       - 'verify-bbsim-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-bbsim-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-jobs':
@@ -34,6 +34,19 @@
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          testTargets: |
+            - target: sanity-bbsim-att
+              workflow: att
+              flags: ""
+              teardown: true
+            - target: sanity-bbsim-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+            - target: sanity-bbsim-tt
+              workflow: tt
+              flags: ""
+              teardown: true
 
 - job-group:
     name: 'verify-bbsim-jobs-master'
diff --git a/jjb/verify/openolt.yaml b/jjb/verify/openolt.yaml
index 04ae7b4..c2fd142 100644
--- a/jjb/verify/openolt.yaml
+++ b/jjb/verify/openolt.yaml
@@ -41,12 +41,6 @@
           build-days-to-keep: '{build-days-to-keep}'
           artifact-num-to-keep: '{artifact-num-to-keep}'
 
-    parameters:
-      - string:
-          name: notificationEmail
-          default: '$GERRIT_EVENT_ACCOUNT_EMAIL'
-          description: 'Verification failure of patch $GERRIT_CHANGE_NUMBER to {project} repo'
-
     node: 'openolt_deb_onf_agent'
     project-type: pipeline
     concurrent: true
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 95faaed..05125b7 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -11,7 +11,7 @@
       - 'verify-voltha-go-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-go-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-go-jobs':
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index 5599400..0f3a58c 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -11,7 +11,7 @@
       - 'verify-voltha-helm-charts-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-helm-charts-jobs-master':
           branch-regexp: '^master$'
 
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 1f2ad0c..aef2900 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -11,7 +11,7 @@
       - 'verify-voltha-onos-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-onos-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-onos-jobs':
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index afc7300..0f98077 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -11,7 +11,7 @@
       - 'verify-voltha-openolt-adapter-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-openolt-adapter-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-openolt-adapter-jobs':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index fad5989..efcef9f 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -11,7 +11,7 @@
       - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-openonu-adapter-go-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-openonu-adapter-go-jobs':
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index d17c0b9..003d28e 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -13,7 +13,7 @@
           build-node:  'ubuntu18.04-basebuild-4c-8g'
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
+          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-system-tests-jobs-master':
           build-node:  'ubuntu18.04-basebuild-4c-8g'
           branch-regexp: '^master$'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 09d4300..53452a0 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1120,11 +1120,6 @@
           default: '{profile}'
           description: 'Technology Profile pushed to the ETCD'
 
-      - string:
-          name: notificationEmail
-          default: 'andy@opennetworking.org'
-          description: ''
-
       - bool:
           name: reinstallOlt
           default: true
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 96140b2..1155584 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -180,7 +180,7 @@
       # voltha-2.8 Jobs
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.8-2-16-32-att-subscribers'
-          'disable-job': true
+          'disable-job': false
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -204,7 +204,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.8-2-16-32-dt-subscribers'
-          'disable-job': true
+          'disable-job': false
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -229,7 +229,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.8-2-16-32-tt-subscribers'
-          'disable-job': true
+          'disable-job': false
           pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -252,9 +252,9 @@
           openonuAdapterGoImg: ''
           onosImg: ''
 
-      # 2.6 multi-stack jobs
+      # 2.8 multi-stack jobs
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-att-subscribers'
+          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-att-subscribers'
           build-node: 'voltha-scale-2'
           'disable-job': true
           pipeline-script: 'voltha-scale-multi-stack.groovy'
@@ -267,7 +267,7 @@
           onus: 32
           withFlows: true
           provisionSubscribers: true
-          release: voltha-2.6
+          release: voltha-2.8
           workflow: att
           withEapol: true
           withDhcp: true
@@ -281,7 +281,7 @@
           onosImg: ''
 
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-dt-subscribers'
+          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-dt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
           'disable-job': true
@@ -294,7 +294,7 @@
           onus: 32
           withFlows: true
           provisionSubscribers: true
-          release: voltha-2.6
+          release: voltha-2.8
           workflow: dt
           withEapol: false
           withDhcp: false
@@ -308,7 +308,7 @@
           onosImg: ''
 
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-tt-subscribers'
+          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-tt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha-scale-multi-stack.groovy'
           'disable-job': true
@@ -321,7 +321,7 @@
           onus: 32
           withFlows: true
           provisionSubscribers: true
-          release: voltha-2.6
+          release: voltha-2.8
           workflow: tt
           withEapol: false
           withDhcp: true
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 83f6243..cf7c91b 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -68,11 +68,6 @@
           default: '{branch}'
 
       - string:
-          name: notificationEmail
-          default: 'you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
-      - string:
           name: workFlow
           default: '{work-flow}'
           description: 'Installs and uses the specified work flow on the POD'
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index 3e0eebe..dde320f 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -58,11 +58,6 @@
           default: 'robot -d Log -T -v xos_chameleon_url:127.0.0.1 -v xos_chameleon_port:30006 -v cord_kafka:\$CORD_KAFKA_IP -v num_olts:10 -v num_onus:1 -v num_pon_ports:10 -v timeout:360s xos-scale-att-workflow.robot'
           description: 'Exact command to execute the tests including arguments'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, teo@opennetworking.org'
-          description: ''
-
     project-type: pipeline
     concurrent: false
 
@@ -117,11 +112,6 @@
           default: 'robot -d Log -T -v helm_chart:$WORKSPACE/cord/helm-charts/xos-services/simpleexampleservice xos-remove-service.robot xos-service-migrations.robot'
           description: 'Exact command to execute the tests including arguments'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, smbaker@opennetworking.org'
-          description: ''
-
     project-type: pipeline
     concurrent: false
 
@@ -176,11 +166,6 @@
           default: 'robot -d Log -T xos-backup.robot'
           description: 'Exact command to execute the tests including arguments'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, smbaker@opennetworking.org'
-          description: ''
-
     project-type: pipeline
     concurrent: false
 
@@ -245,11 +230,6 @@
           default: 'robot -d Log -T -v server_ip:127.0.0.1 -v server_port:30006 -v cord_kafka:\$CORD_KAFKA_IP ATT_Workflow.robot'
           description: 'Exact command to execute the tests including arguments'
 
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, teo@opennetworking.org'
-          description: ''
-
       - bool:
           name: InstallService
           default: true
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 9e27d33..9979cd9 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -53,6 +53,9 @@
           def bbsimCfg = readYaml file: "$WORKSPACE/voltha-helm-charts/examples/${cfg.workflow}-values.yaml"
           // NOTE we assume that the only service that needs a different s_tag is the first one in the list
           bbsimCfg["servicesConfig"]["services"][0]["s_tag"] = startingStag + i
+          // remove the ONOS config that is defined in the values file
+          // it's not relevant for BBSim (it won't break anything, but it will clustter the console output)
+          bbsimCfg.remove('onos')
           println "Using BBSim Service config ${bbsimCfg}"
           writeYaml file: "$WORKSPACE/bbsimCfg${cfg.stackId}${i}.yaml", data: bbsimCfg
         } else {