diff --git a/jjb/pipeline/voltha/makefile b/jjb/pipeline/voltha/makefile
index a3cb9b0..6c948c3 100644
--- a/jjb/pipeline/voltha/makefile
+++ b/jjb/pipeline/voltha/makefile
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
 version += master
+version += voltha-2.12
 version += voltha-2.11
 version += voltha-2.8
 version += playground
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index d3950ea..6d0ba1a 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -190,9 +190,9 @@
       mkdir -p "$WORKSPACE/voltha-pods-mem-consumption-${workflow}"
       cd "$WORKSPACE/voltha-system-tests"
       make vst_venv
-      source ./vst_venv/bin/activate || true
+      source ./vst_venv/bin/activate
       # Collect initial memory consumption
-      python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace} || true
+      python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace}
     fi
     """
 
@@ -202,7 +202,7 @@
     ROBOT_MISC_ARGS+="-v ONOS_SSH_PORT:30115 -v ONOS_REST_PORT:30120 -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace} -v container_log_dir:${logsDir} -v logging:${testLogging}"
     export KVSTOREPREFIX=voltha/voltha_voltha
 
-    make -C "$WORKSPACE/voltha-system-tests" ${testTarget} || true
+    make -C "$WORKSPACE/voltha-system-tests" ${testTarget}
     """
 
         getPodsInfo("${logsDir}")
@@ -212,15 +212,15 @@
       # collect logs collected in the Robot Framework StartLogging keyword
       cd ${logsDir}
       gzip *-combined.log || true
-      rm *-combined.log || true
+      rm -f *-combined.log || true
     """
 
     sh """
     if [ ${withMonitoring} = true ] ; then
       cd "$WORKSPACE/voltha-system-tests"
-      source ./vst_venv/bin/activate || true
+      source ./vst_venv/bin/activate
       # Collect memory consumption of voltha pods once all the tests are complete
-      python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace} || true
+      python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace}
     fi
     """
     } // stage
@@ -232,7 +232,7 @@
 {
   getPodsInfo("$WORKSPACE/${exitStatus}")
   sh """
-  kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/${exitStatus}/voltha.log || true
+  kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/${exitStatus}/voltha.log
   """
   archiveArtifacts artifacts: '**/*.log,**/*.gz,**/*.txt,**/*.html,**/voltha-pods-mem-consumption-att/*,**/voltha-pods-mem-consumption-dt/*,**/voltha-pods-mem-consumption-tt/*'
   sh '''
diff --git a/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
index daa2bec..c9293fc 100644
--- a/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
@@ -23,7 +23,8 @@
 
 def clusterName = "kind-ci"
 
-def execute_test(testTarget, workflow, testLogging, teardown, testSpecificHelmFlags = "") {
+def execute_test(testTarget, workflow, testLogging, teardown, testSpecificHelmFlags = "")
+{
     def infraNamespace = "default"
     def volthaNamespace = "voltha"
     def logsDir = "$WORKSPACE/${testTarget}"
@@ -48,7 +49,7 @@
 		returnStdout: true,
 		script: cmd)
 	    println(" ** ${cmd}:\n${stream}")
-	    
+
             println("** ${iam}: LEAVE")
 	}
     }
diff --git a/jjb/pipeline/voltha/voltha-2.11/physical-build.groovy b/jjb/pipeline/voltha/voltha-2.11/physical-build.groovy
index b985ed1..1e52f25 100755
--- a/jjb/pipeline/voltha/voltha-2.11/physical-build.groovy
+++ b/jjb/pipeline/voltha/voltha-2.11/physical-build.groovy
@@ -46,7 +46,7 @@
    """
 
     println("** ${iam}: LEAVE")
-    return    
+    return
 }
 
 pipeline {
@@ -428,3 +428,5 @@
     }
   }
 }
+
+// [EOF]
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index d3950ea..ce04a78 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -38,7 +38,7 @@
                 'jjb',
                 'pipeline',
                 'voltha',
-                'master',
+                'voltha-2.12',
                 'bbsim-tests.groovy'
             ].join('/')
             println("** ${iam}: ENTER")
@@ -46,7 +46,7 @@
             String cmd = "which pkill"
             def stream = sh(
                 returnStatus:false,
-                returnStdout: true,
+                returnStdout:true,
                 script: cmd)
             println(" ** ${cmd}:\n${stream}")
 
@@ -107,7 +107,10 @@
 
           // if we're downloading a voltha-helm-charts patch, then install from a local copy of the charts
           def localCharts = false
-          if (volthaHelmChartsChange != "" || gerritProject == "voltha-helm-charts") {
+	  if (volthaHelmChartsChange != ""
+	      || gerritProject == "voltha-helm-charts"
+	      || branch != 'master'
+	  ) {
             localCharts = true
           }
 
@@ -202,7 +205,7 @@
     ROBOT_MISC_ARGS+="-v ONOS_SSH_PORT:30115 -v ONOS_REST_PORT:30120 -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace} -v container_log_dir:${logsDir} -v logging:${testLogging}"
     export KVSTOREPREFIX=voltha/voltha_voltha
 
-    make -C "$WORKSPACE/voltha-system-tests" ${testTarget} || true
+    make -C "$WORKSPACE/voltha-system-tests" ${testTarget}
     """
 
         getPodsInfo("${logsDir}")
@@ -218,9 +221,9 @@
     sh """
     if [ ${withMonitoring} = true ] ; then
       cd "$WORKSPACE/voltha-system-tests"
-      source ./vst_venv/bin/activate || true
+      source ./vst_venv/bin/activate
       # Collect memory consumption of voltha pods once all the tests are complete
-      python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace} || true
+      python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace}
     fi
     """
     } // stage
diff --git a/jjb/pipeline/voltha/voltha-2.12/physical-build.groovy b/jjb/pipeline/voltha/voltha-2.12/physical-build.groovy
index 7916679..f216e92 100755
--- a/jjb/pipeline/voltha/voltha-2.12/physical-build.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/physical-build.groovy
@@ -428,3 +428,5 @@
     }
   }
 }
+
+// [EOF]
diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
index 2e5b34c..80f86ef 100644
--- a/jjb/repos/voltha-helm-charts.yaml
+++ b/jjb/repos/voltha-helm-charts.yaml
@@ -1,5 +1,5 @@
 ---
-# SPDX-FileCopyrightText: 2018-2022 Open Networking Foundation <info@opennetworking.org>
+# SPDX-FileCopyrightText: 2018-2023 Open Networking Foundation <info@opennetworking.org>
 # SPDX-License-Identifier: Apache-2.0
 
 - project:
@@ -10,14 +10,18 @@
     jobs:
       - 'verify-voltha-helm-charts-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-helm-charts-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-helm-charts-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-helm-charts-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
+#      - 'verify-voltha-helm-charts-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-helm-charts-jobs-master':
           branch-regexp: '^master$'
 
@@ -31,10 +35,15 @@
       - 'publish-helm-repo'
 
 - job-group:
-    name: 'verify-voltha-helm-charts-jobs-voltha-2.8'
+    name: 'verify-voltha-helm-charts-jobs-master'
+    jobs:
+      - 'voltha-patch-test'
+      
+- job-group:
+    name: 'verify-voltha-helm-charts-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-helm-charts-jobs-voltha-2.11'
@@ -42,9 +51,10 @@
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-helm-charts-jobs-master'
-    jobs:
-      - 'voltha-patch-test'
-
+# - job-group:
+#    name: 'verify-voltha-helm-charts-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          
 # [EOF]
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index d8bd148..9076026 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -8,7 +8,7 @@
     project-name: '{name}'
 
     jobs:
-      - 'software-upgrades-test-new':
+      - 'software-upgrades-test-master':
           name: 'periodic-software-upgrade-test-bbsim'
           pipeline-script: 'voltha/master/software-upgrades.groovy'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
@@ -39,6 +39,44 @@
           onu-image-crc: '0'
           time-trigger: "H H/23 * * *"
 
+# -----------------------------------------------------------------------
+# https://docs.voltha.org/master/release_notes/voltha_2.12.html#id7
+# https://wiki.opennetworking.org/display/VOLTHA/v2.12+Deployments
+# -----------------------------------------------------------------------
+      - 'software-upgrades-test-voltha-2.12':
+          name: 'periodic-software-upgrade-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/software-upgrades.groovy'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          code-branch: 'voltha-2.12'
+          aaa-version: '2.10.3'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.10.3/aaa-app-2.10.3.oar'
+          olt-version: '5.2.4'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.2.4/olt-app-5.2.4.oar'
+          dhcpl2relay-version: '2.10.0'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.10.0/dhcpl2relay-app-2.10.0.oar'
+          igmpproxy-version: '2.8.0'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.8.0/onos-app-igmpproxy-app-2.8.0.oar'
+          sadis-version: '5.11.1'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.11.1/sadis-app-5.11.1.oar'
+          mcast-version: '2.9.0'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.9.0/mcast-app-2.9.0.oar'
+          kafka-version: '2.12.0'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.12.0/kafka-2.12.0.oar'
+          openolt-adapter-deploy-base-tag: '4.2.6'
+          openonu-adapter-deploy-base-tag: '2.2.8'
+          rw-core-deploy-base-tag: '3.1.8'
+          ofagent-deploy-base-tag: '2.1.2'
+          onu-image-version: 'BBSM_IMG_00002'
+          onu-image-url: 'http://bbsim0:50074/images/software-image.img'
+          onu-image-vendor: 'BBSM'
+          onu-image-activate-on-success: 'false'
+          onu-image-commit-on-success: 'false'
+          onu-image-crc: '0'
+          time-trigger: "H H/23 * * *"
+
+# -----------------------------------------------------------------------         
+# https://docs.voltha.org/master/release_notes/voltha_2.11.html#onos-apps
+# -----------------------------------------------------------------------         
       - 'software-upgrades-test-voltha-2.11':
           name: 'periodic-software-upgrade-test-bbsim-2.11'
           pipeline-script: 'voltha/voltha-2.11/software-upgrades.groovy'
@@ -70,40 +108,42 @@
           onu-image-crc: '0'
           time-trigger: "H H/23 * * *"
 
-      - 'software-upgrades-test-old':
-          name: 'periodic-software-upgrade-test-bbsim-2.8'
-          pipeline-script: 'voltha/voltha-2.8/software-upgrades.groovy'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
-          code-branch: 'voltha-2.8'
-          aaa-version: '2.4.0'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0/aaa-app-2.4.0.oar'
-          olt-version: '4.5.0'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0/olt-app-4.5.0.oar'
-          dhcpl2relay-version: '2.5.0'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0/dhcpl2relay-app-2.5.0.oar'
-          igmpproxy-version: '2.3.0'
-          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.3.0/onos-app-igmpproxy-app-2.3.0.oar'
-          sadis-version: '5.4.0'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0/sadis-app-5.4.0.oar'
-          mcast-version: '2.4.0'
-          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
-          kafka-version: '2.7.0'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.12'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.28'
-          rw-core-image: 'voltha/voltha-rw-core:2.9.6'
-          ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
-          onu-image-version: 'BBSM_IMG_00002'
-          onu-image-url: 'http://bbsim0:50074/images/software-image.img'
-          onu-image-vendor: 'BBSM'
-          onu-image-activate-on-success: 'false'
-          onu-image-commit-on-success: 'false'
-          onu-image-crc: '0'
-          time-trigger: "H H/23 * * *"
+#      - 'software-upgrades-test-2.8':
+#          name: 'periodic-software-upgrade-test-bbsim-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/software-upgrades.groovy'
+#          build-node: 'ubuntu18.04-basebuild-8c-15g'
+#          code-branch: 'voltha-2.8'
+#          aaa-version: '2.4.0'
+#          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0/aaa-app-2.4.0.oar'
+#          olt-version: '4.5.0'
+#          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0/olt-app-4.5.0.oar'
+#          dhcpl2relay-version: '2.5.0'
+#          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0/dhcpl2relay-app-2.5.0.oar'
+#          igmpproxy-version: '2.3.0'
+#          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.3.0/onos-app-igmpproxy-app-2.3.0.oar'
+#          sadis-version: '5.4.0'
+#          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0/sadis-app-5.4.0.oar'
+#          mcast-version: '2.4.0'
+#          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
+#          kafka-version: '2.7.0'
+#          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
+#          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.12'
+#          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.28'
+#          rw-core-image: 'voltha/voltha-rw-core:2.9.6'
+#          ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
+#          onu-image-version: 'BBSM_IMG_00002'
+#          onu-image-url: 'http://bbsim0:50074/images/software-image.img'
+#          onu-image-vendor: 'BBSM'
+#          onu-image-activate-on-success: 'false'
+#          onu-image-commit-on-success: 'false'
+#          onu-image-crc: '0'
+#          time-trigger: "H H/23 * * *"
 
+# -----------------------------------------------------------------------
 # to be used for voltha releases 2.9 onwards
+# -----------------------------------------------------------------------
 - job-template:
-    id: 'software-upgrades-test-new'
+    id: 'software-upgrades-test-master'
     name: '{name}'
     sandbox: true
     volthaSystemTestsChange: ''
@@ -298,7 +338,207 @@
                  TZ=America/Los_Angeles
                  {time-trigger}
 
+# -----------------------------------------------------------------------
+# -----------------------------------------------------------------------
+- job-template:
+    id: 'software-upgrades-test-voltha-2.12'
+    name: '{name}'
+    sandbox: true
+    volthaSystemTestsChange: ''
+    volthaHelmChartsChange: ''
+    kindVolthaChange: ''
+    logLevel: 'DEBUG'
+    logging: true
+
+    description: |
+      <!-- Managed by Jenkins Job Builder -->
+      Created by {id} job-template from ci-management/jjb/software-upgrades.yaml  <br /><br />
+      E2E Validation for Voltha 2.X
+    properties:
+      - onf-infra-volthadevs-permissions
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+          name: buildNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins node to run the job on'
+
+      - string:
+          name: extraHelmFlags
+          default: ''
+          description: 'Helm flags to pass to every helm install command'
+
+      - string:
+          name: volthaSystemTestsChange
+          default: ''
+          description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
+
+      - string:
+          name: volthaHelmChartsChange
+          default: ''
+          description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/79/18779/13"'
+
+      - string:
+          name: branch
+          default: '{code-branch}'
+          description: 'Name of the branch to use'
+
+      - string:
+          name: onosImg
+          default: ''
+          description: 'ONOS Image to use'
+
+      - string:
+          name: aaaVer
+          default: '{aaa-version}'
+          description: 'ONOS AAA App Version to Test Upgrade'
+
+      - string:
+          name: aaaOarUrl
+          default: '{aaa-oar-url}'
+          description: 'ONOS AAA App OAR File Url'
+
+      - string:
+          name: oltVer
+          default: '{olt-version}'
+          description: 'ONOS OLT App Version to Test Upgrade'
+
+      - string:
+          name: oltOarUrl
+          default: '{olt-oar-url}'
+          description: 'ONOS OLT App OAR File Url'
+
+      - string:
+          name: dhcpl2relayVer
+          default: '{dhcpl2relay-version}'
+          description: 'ONOS DHCP L2 Relay App Version to Test Upgrade'
+
+      - string:
+          name: dhcpl2relayOarUrl
+          default: '{dhcpl2relay-oar-url}'
+          description: 'ONOS DHCP L2 Relay App OAR File Url'
+
+      - string:
+          name: igmpproxyVer
+          default: '{igmpproxy-version}'
+          description: 'ONOS Igmp Proxy App Version to Test Upgrade'
+
+      - string:
+          name: igmpproxyOarUrl
+          default: '{igmpproxy-oar-url}'
+          description: 'ONOS Igmp Proxy App OAR File Url'
+
+      - string:
+          name: sadisVer
+          default: '{sadis-version}'
+          description: 'ONOS Sadis App Version to Test Upgrade'
+
+      - string:
+          name: sadisOarUrl
+          default: '{sadis-oar-url}'
+          description: 'ONOS Sadis App OAR File Url'
+
+      - string:
+          name: mcastVer
+          default: '{mcast-version}'
+          description: 'ONOS MCast App Version to Test Upgrade'
+
+      - string:
+          name: mcastOarUrl
+          default: '{mcast-oar-url}'
+          description: 'ONOS MCast App OAR File Url'
+
+      - string:
+          name: kafkaVer
+          default: '{kafka-version}'
+          description: 'ONOS Kafka App Version to Test Upgrade'
+
+      - string:
+          name: kafkaOarUrl
+          default: '{kafka-oar-url}'
+          description: 'ONOS Kafka App OAR File Url'
+
+      - string:
+          name: openoltAdapterDeployBaseTag
+          default: '{openolt-adapter-deploy-base-tag}'
+          description: 'Minimum Version of OpenOLT Adapter to be used for Deployment'
+
+      - string:
+          name: openonuAdapterDeployBaseTag
+          default: '{openonu-adapter-deploy-base-tag}'
+          description: 'Minimum Version of OpenONU Adapter to be used for Deployment'
+
+      - string:
+          name: rwCoreDeployBaseTag
+          default: '{rw-core-deploy-base-tag}'
+          description: 'Minimum Version of RW Core to be used for Deployment'
+
+      - string:
+          name: ofagentDeployBaseTag
+          default: '{ofagent-deploy-base-tag}'
+          description: 'Minimum Version of Ofagent to be used for Deployment'
+
+      - string:
+          name: onuImageVersion
+          default: '{onu-image-version}'
+          description: 'Version of ONU Image to Upgrade'
+
+      - string:
+          name: onuImageUrl
+          default: '{onu-image-url}'
+          description: 'Url of ONU Image to Upgrade'
+
+      - string:
+          name: onuImageVendor
+          default: '{onu-image-vendor}'
+          description: 'Vendor of ONU Image to Upgrade'
+
+      - string:
+          name: onuImageActivateOnSuccess
+          default: '{onu-image-activate-on-success}'
+          description: 'Activate ONU Image'
+
+      - string:
+          name: onuImageCommitOnSuccess
+          default: '{onu-image-commit-on-success}'
+          description: 'Commit ONU Image'
+
+      - string:
+          name: onuImageCrc
+          default: '{onu-image-crc}'
+          description: 'CRC of ONU Image to Upgrade'
+
+      - string:
+          name: logLevel
+          default: '{logLevel}'
+          description: 'Log level for all the components'
+
+      - bool:
+          name: logging
+          default: '{logging}'
+          description: 'Option to collect voltha components logs per test case'
+
+    project-type: pipeline
+    concurrent: true
+
+    dsl: !include-raw-escape: pipeline/{pipeline-script}
+
+    triggers:
+      - timed: |
+                 TZ=America/Los_Angeles
+                 {time-trigger}
+
+# -----------------------------------------------------------------------
 # to be used for voltha releases 2.9 onwards
+# -----------------------------------------------------------------------
 - job-template:
     id: 'software-upgrades-test-voltha-2.11'
     name: '{name}'
@@ -495,207 +735,209 @@
                  TZ=America/Los_Angeles
                  {time-trigger}
 
+# -----------------------------------------------------------------------
 # to be used for voltha release 2.8
-- job-template:
-    id: 'software-upgrades-test-old'
-    name: '{name}'
-    sandbox: true
-    volthaSystemTestsChange: ''
-    volthaHelmChartsChange: ''
-    kindVolthaChange: ''
-    logLevel: 'DEBUG'
-    logging: true
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/software-upgrades.yaml  <br /><br />
-      E2E Validation for Voltha 2.X
-    properties:
-      - onf-infra-volthadevs-permissions
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: extraHelmFlags
-          default: ''
-          description: 'Helm flags to pass to every helm install command'
-
-      - string:
-          name: volthaSystemTestsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: volthaHelmChartsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: branch
-          default: '{code-branch}'
-          description: 'Name of the branch to use'
-
-      # deprecated params (not used in master, remove after 2.6 support is dropped)
-      - string:
-          name: kindVolthaChange
-          default: ''
-          description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
-
-      - string:
-          name: onosImg
-          default: ''
-          description: 'ONOS Image to use'
-
-      - string:
-          name: aaaVer
-          default: '{aaa-version}'
-          description: 'ONOS AAA App Version to Test Upgrade'
-
-      - string:
-          name: aaaOarUrl
-          default: '{aaa-oar-url}'
-          description: 'ONOS AAA App OAR File Url'
-
-      - string:
-          name: oltVer
-          default: '{olt-version}'
-          description: 'ONOS OLT App Version to Test Upgrade'
-
-      - string:
-          name: oltOarUrl
-          default: '{olt-oar-url}'
-          description: 'ONOS OLT App OAR File Url'
-
-      - string:
-          name: dhcpl2relayVer
-          default: '{dhcpl2relay-version}'
-          description: 'ONOS DHCP L2 Relay App Version to Test Upgrade'
-
-      - string:
-          name: dhcpl2relayOarUrl
-          default: '{dhcpl2relay-oar-url}'
-          description: 'ONOS DHCP L2 Relay App OAR File Url'
-
-      - string:
-          name: igmpproxyVer
-          default: '{igmpproxy-version}'
-          description: 'ONOS Igmp Proxy App Version to Test Upgrade'
-
-      - string:
-          name: igmpproxyOarUrl
-          default: '{igmpproxy-oar-url}'
-          description: 'ONOS Igmp Proxy App OAR File Url'
-
-      - string:
-          name: sadisVer
-          default: '{sadis-version}'
-          description: 'ONOS Sadis App Version to Test Upgrade'
-
-      - string:
-          name: sadisOarUrl
-          default: '{sadis-oar-url}'
-          description: 'ONOS Sadis App OAR File Url'
-
-      - string:
-          name: mcastVer
-          default: '{mcast-version}'
-          description: 'ONOS MCast App Version to Test Upgrade'
-
-      - string:
-          name: mcastOarUrl
-          default: '{mcast-oar-url}'
-          description: 'ONOS MCast App OAR File Url'
-
-      - string:
-          name: kafkaVer
-          default: '{kafka-version}'
-          description: 'ONOS Kafka App Version to Test Upgrade'
-
-      - string:
-          name: kafkaOarUrl
-          default: '{kafka-oar-url}'
-          description: 'ONOS Kafka App OAR File Url'
-
-      - string:
-          name: adapterOpenOltImage
-          default: '{adapter-open-olt-image}'
-          description: 'Voltha Adapter Open OLT Component Image'
-
-      - string:
-          name: adapterOpenOnuImage
-          default: '{adapter-open-onu-image}'
-          description: 'Voltha Adapter Open ONU Component Image'
-
-      - string:
-          name: rwCoreImage
-          default: '{rw-core-image}'
-          description: 'Voltha RW Core Component Image'
-
-      - string:
-          name: ofAgentImage
-          default: '{ofagent-image}'
-          description: 'Voltha Ofagent Component Image'
-
-      - string:
-          name: onuImageVersion
-          default: '{onu-image-version}'
-          description: 'Version of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageUrl
-          default: '{onu-image-url}'
-          description: 'Url of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageVendor
-          default: '{onu-image-vendor}'
-          description: 'Vendor of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageActivateOnSuccess
-          default: '{onu-image-activate-on-success}'
-          description: 'Activate ONU Image'
-
-      - string:
-          name: onuImageCommitOnSuccess
-          default: '{onu-image-commit-on-success}'
-          description: 'Commit ONU Image'
-
-      - string:
-          name: onuImageCrc
-          default: '{onu-image-crc}'
-          description: 'CRC of ONU Image to Upgrade'
-
-      - string:
-          name: logLevel
-          default: '{logLevel}'
-          description: 'Log level for all the components'
-
-      - bool:
-          name: logging
-          default: '{logging}'
-          description: 'Option to collect voltha components logs per test case'
-
-    project-type: pipeline
-    concurrent: true
-
-    dsl: !include-raw-escape: pipeline/{pipeline-script}
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 {time-trigger}
+# -----------------------------------------------------------------------
+# - job-template:
+#    id: 'software-upgrades-test-2.8'
+#    name: '{name}'
+#    sandbox: true
+#    volthaSystemTestsChange: ''
+#    volthaHelmChartsChange: ''
+#    kindVolthaChange: ''
+#    logLevel: 'DEBUG'
+#    logging: true
+#
+#    description: |
+#      <!-- Managed by Jenkins Job Builder -->
+#      Created by {id} job-template from ci-management/jjb/software-upgrades.yaml  <br /><br />
+#      E2E Validation for Voltha 2.X
+#    properties:
+#      - onf-infra-volthadevs-permissions
+#      - cord-infra-properties:
+#          build-days-to-keep: '{build-days-to-keep}'
+#          artifact-num-to-keep: '{artifact-num-to-keep}'
+#
+#    wrappers:
+#      - lf-infra-wrappers:
+#          build-timeout: '{build-timeout}'
+#          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+#
+#    parameters:
+#      - string:
+#          name: buildNode
+#          default: '{build-node}'
+#          description: 'Name of the Jenkins node to run the job on'
+#
+#      - string:
+#          name: extraHelmFlags
+#          default: ''
+#          description: 'Helm flags to pass to every helm install command'
+#
+#      - string:
+#          name: volthaSystemTestsChange
+#          default: ''
+#          description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
+#
+#      - string:
+#          name: volthaHelmChartsChange
+#          default: ''
+#          description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/79/18779/13"'
+#
+#      - string:
+#          name: branch
+#          default: '{code-branch}'
+#          description: 'Name of the branch to use'
+#
+#      # deprecated params (not used in master, remove after 2.6 support is dropped)
+#      - string:
+#          name: kindVolthaChange
+#          default: ''
+#          description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
+#
+#      - string:
+#          name: onosImg
+#          default: ''
+#          description: 'ONOS Image to use'
+#
+#      - string:
+#          name: aaaVer
+#          default: '{aaa-version}'
+#          description: 'ONOS AAA App Version to Test Upgrade'
+#
+#      - string:
+#          name: aaaOarUrl
+#          default: '{aaa-oar-url}'
+#          description: 'ONOS AAA App OAR File Url'
+#
+#      - string:
+#          name: oltVer
+#          default: '{olt-version}'
+#          description: 'ONOS OLT App Version to Test Upgrade'
+#
+#      - string:
+#          name: oltOarUrl
+#          default: '{olt-oar-url}'
+#          description: 'ONOS OLT App OAR File Url'
+#
+#      - string:
+#          name: dhcpl2relayVer
+#          default: '{dhcpl2relay-version}'
+#          description: 'ONOS DHCP L2 Relay App Version to Test Upgrade'
+#
+#      - string:
+#          name: dhcpl2relayOarUrl
+#          default: '{dhcpl2relay-oar-url}'
+#          description: 'ONOS DHCP L2 Relay App OAR File Url'
+#
+#      - string:
+#          name: igmpproxyVer
+#          default: '{igmpproxy-version}'
+#          description: 'ONOS Igmp Proxy App Version to Test Upgrade'
+#
+#      - string:
+#          name: igmpproxyOarUrl
+#          default: '{igmpproxy-oar-url}'
+#          description: 'ONOS Igmp Proxy App OAR File Url'
+#
+#      - string:
+#          name: sadisVer
+#          default: '{sadis-version}'
+#          description: 'ONOS Sadis App Version to Test Upgrade'
+#
+#      - string:
+#          name: sadisOarUrl
+#          default: '{sadis-oar-url}'
+#          description: 'ONOS Sadis App OAR File Url'
+#
+#      - string:
+#          name: mcastVer
+#          default: '{mcast-version}'
+#          description: 'ONOS MCast App Version to Test Upgrade'
+#
+#      - string:
+#          name: mcastOarUrl
+#          default: '{mcast-oar-url}'
+#          description: 'ONOS MCast App OAR File Url'
+#
+#      - string:
+#          name: kafkaVer
+#          default: '{kafka-version}'
+#          description: 'ONOS Kafka App Version to Test Upgrade'
+#
+#      - string:
+#          name: kafkaOarUrl
+#          default: '{kafka-oar-url}'
+#          description: 'ONOS Kafka App OAR File Url'
+#
+#      - string:
+#          name: adapterOpenOltImage
+#          default: '{adapter-open-olt-image}'
+#          description: 'Voltha Adapter Open OLT Component Image'
+#
+#      - string:
+#          name: adapterOpenOnuImage
+#          default: '{adapter-open-onu-image}'
+#          description: 'Voltha Adapter Open ONU Component Image'
+#
+#      - string:
+#          name: rwCoreImage
+#          default: '{rw-core-image}'
+#          description: 'Voltha RW Core Component Image'
+#
+#      - string:
+#          name: ofAgentImage
+#          default: '{ofagent-image}'
+#          description: 'Voltha Ofagent Component Image'
+#
+#      - string:
+#          name: onuImageVersion
+#          default: '{onu-image-version}'
+#          description: 'Version of ONU Image to Upgrade'
+#
+#      - string:
+#          name: onuImageUrl
+#          default: '{onu-image-url}'
+#          description: 'Url of ONU Image to Upgrade'
+#
+#      - string:
+#          name: onuImageVendor
+#          default: '{onu-image-vendor}'
+#          description: 'Vendor of ONU Image to Upgrade'
+#
+#      - string:
+#          name: onuImageActivateOnSuccess
+#          default: '{onu-image-activate-on-success}'
+#          description: 'Activate ONU Image'
+#
+#      - string:
+#          name: onuImageCommitOnSuccess
+#          default: '{onu-image-commit-on-success}'
+#          description: 'Commit ONU Image'
+#
+#      - string:
+#          name: onuImageCrc
+#          default: '{onu-image-crc}'
+#          description: 'CRC of ONU Image to Upgrade'
+#
+#      - string:
+#          name: logLevel
+#          default: '{logLevel}'
+#          description: 'Log level for all the components'
+#
+#      - bool:
+#          name: logging
+#          default: '{logging}'
+#          description: 'Option to collect voltha components logs per test case'
+#
+#    project-type: pipeline
+#    concurrent: true
+#
+#    dsl: !include-raw-escape: pipeline/{pipeline-script}
+#
+#    triggers:
+#      - timed: |
+#                 TZ=America/Los_Angeles
+#                 {time-trigger}
 
 # [EOF]
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 37dbd19..91c5bdd 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -8,12 +8,12 @@
     jobs:
       - 'verify-bbsim-sadis-server-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-bbsim-sadis-server-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-bbsim-sadis-server-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-bbsim-sadis-server-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
       - 'verify-bbsim-sadis-server-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-sadis-server-jobs':
@@ -32,22 +32,22 @@
           unit-test-keep-going: 'false'
 
 - job-group:
-    name: 'verify-bbsim-sadis-server-jobs-voltha-2.11'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-bbsim-sadis-server-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-bbsim-sadis-server-jobs-master'
     jobs:
       - 'voltha-patch-test':
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          
+- job-group:
+    name: 'verify-bbsim-sadis-server-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
+    name: 'verify-bbsim-sadis-server-jobs-voltha-2.11'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-bbsim-sadis-server-jobs'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 5866715..4b85faa 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -9,14 +9,18 @@
     jobs:
       - 'verify-bbsim-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-bbsim-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-bbsim-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-bbsim-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
+#      - 'verify-bbsim-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'verify-bbsim-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-jobs':
@@ -34,11 +38,57 @@
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
 
+#- job-group:
+#    name: 'verify-bbsim-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          testTargets: |
+#            - target: sanity-bbsim-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: sanity-bbsim-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: sanity-bbsim-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#
+
 - job-group:
-    name: 'verify-bbsim-jobs-voltha-2.8'
+    name: 'verify-bbsim-jobs-master'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          testTargets: |
+            - target: sanity-bbsim-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-bbsim-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-bbsim-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+
+- job-group:
+    name: 'verify-bbsim-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
           testTargets: |
             - target: sanity-bbsim-att
               workflow: att
@@ -78,29 +128,7 @@
               flags: ""
               teardown: true
               logging: true
-
-- job-group:
-    name: 'verify-bbsim-jobs-master'
-    jobs:
-      - 'voltha-patch-test':
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
-          testTargets: |
-            - target: sanity-bbsim-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-
+              
 - job-group:
     name: 'publish-bbsim-jobs'
     jobs:
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index ae2469a..de4fad4 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-ofagent-go-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-ofagent-jobs-master':
+          branch-regexp: '^master$'          
+      - 'verify-ofagent-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '{kind-voltha-regexp}'
       - 'verify-ofagent-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '{kind-voltha-regexp}'
-      - 'verify-ofagent-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
-      - 'verify-ofagent-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-ofagent-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '{kind-voltha-regexp}'
       - 'publish-ofagent-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -35,22 +39,28 @@
           junit-allow-empty-results: true
 
 - job-group:
-    name: 'verify-ofagent-jobs-voltha-2.11'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-ofagent-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-ofagent-jobs-master'
     jobs:
       - 'voltha-patch-test':
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          
+- job-group:
+    name: 'verify-ofagent-jobs-voltha-2.11'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          
+- job-group:
+    name: 'verify-ofagent-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+# - job-group:
+#    name: 'verify-ofagent-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-ofagent-go-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 226863e..7b508a0 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-go-jobs-master':
+          branch-regexp: '^master$'          
+      - 'verify-voltha-go-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-go-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-go-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-go-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-go-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -43,16 +47,22 @@
           unit-test-keep-going: 'false'
 
 - job-group:
+    name: 'verify-voltha-go-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-go-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-go-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+# - job-group:
+#    name: 'verify-voltha-go-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-go-jobs-master'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 8815676..6779887 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-onos-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-onos-jobs-master':
+          branch-regexp: '^master$'
+      - 'verify-voltha-onos-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-onos-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-onos-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-onos-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-onos-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-onos-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -29,16 +33,22 @@
           dependency-jobs: 'verify_voltha-onos_licensed'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-voltha-2.11'
+    name: 'verify-voltha-onos-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-voltha-2.8'
+    name: 'verify-voltha-onos-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+#- job-group:
+#    name: 'verify-voltha-onos-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-onos-jobs-master'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index a3b40b8..3e9afde 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-openolt-adapter-jobs-master':
+          branch-regexp: '^master$'
+      - 'verify-voltha-openolt-adapter-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-openolt-adapter-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-openolt-adapter-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-openolt-adapter-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-openolt-adapter-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -43,22 +47,28 @@
           build-node: 'ubuntu18.04-basebuild-2c-4g'
 
 - job-group:
+    name: 'verify-voltha-openolt-adapter-jobs-master'
+    jobs:
+      - 'voltha-patch-test':
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          
+- job-group:
+    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-openolt-adapter-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-master'
-    jobs:
-      - 'voltha-patch-test':
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+#- job-group:
+#    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-openolt-adapter-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index a7c36ae..574d1c1 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-openonu-adapter-go-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-openonu-adapter-go-jobs-master':
+          branch-regexp: '^master$'
+      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-openonu-adapter-go-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-openonu-adapter-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -42,16 +46,22 @@
           build-node: 'ubuntu18.04-basebuild-2c-4g'
 
 - job-group:
+    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#- job-group:
+#    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-master'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 08a4c8e..b62dd2b 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -9,19 +9,24 @@
       - 'verify-voltha-system-tests-jobs':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-system-tests-jobs-master':
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          branch-regexp: '^master$'
+      - 'verify-voltha-system-tests-jobs-voltha-2.12':
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-system-tests-jobs-voltha-2.11':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-system-tests-jobs-voltha-2.8':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-system-tests-jobs-master':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          branch-regexp: '^master$'
+#      - 'verify-voltha-system-tests-jobs-voltha-2.8':
+#          build-node: 'ubuntu18.04-basebuild-4c-8g'
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
 
 - job-group:
     name: 'verify-voltha-system-tests-jobs'
@@ -35,16 +40,22 @@
           junit-allow-empty-results: true
 
 - job-group:
+    name: 'verify-voltha-system-tests-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-system-tests-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-system-tests-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#- job-group:
+#    name: 'verify-voltha-system-tests-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-system-tests-jobs-master'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index a09a09e..50430cc 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1,5 +1,8 @@
 ---
+# end-2-end pipeline jobs
+# -----------------------------------------------------------------------
 # voltha 2.0 tests
+# -----------------------------------------------------------------------
 
 - project:
     name: voltha-e2e
@@ -21,6 +24,9 @@
     make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
 
     jobs:
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-test-bbsim'
           code-branch: 'master'
@@ -49,34 +55,34 @@
               teardown: false
               logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multiple-olts-test-bbsim-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          olts: 2
-          extraHelmFlags: '--set onu=2,pon=2'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-multi-olt
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-multiolt-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-multiolt-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-multiolt-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-multiple-olts-test-bbsim-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          olts: 2
+#          extraHelmFlags: '--set onu=2,pon=2'
+#          time-trigger: "H H/23 * * *"
+#          testTargets: |
+#            - target: functional-multi-olt
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: bbsim-multiolt-failurescenarios
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: bbsim-multiolt-errorscenarios
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: bbsim-multiolt-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-test-bbsim-2.11'
@@ -108,6 +114,37 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-multiple-olts-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          olts: 2
+          extraHelmFlags: '--set onu=2,pon=2'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-multi-olt
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiolt-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiolt-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiolt-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-test-bbsim'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
@@ -153,10 +190,35 @@
               logging: true
           timeout: 360
 
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-multi-uni-test-bbsim-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+#          time-trigger: "H H/23 * * *"
+#          testTargets: |
+#            - target: functional-single-kind-multiuni-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: bbsim-multiuni-failurescenarios-att
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: bbsim-multiuni-errorscenarios-att
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-multi-uni-test-bbsim-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
+          name: 'periodic-voltha-multi-uni-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
           extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
           time-trigger: "H H/23 * * *"
           testTargets: |
@@ -199,30 +261,32 @@
               teardown: false
               logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          olts: 2
-          extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-multiuni-multiolt-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-multiuni-multiolt-failurescenarios-att
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-multiuni-multiolt-errorscenarios-att
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-          timeout: 180
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          olts: 2
+#          extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+#          time-trigger: "H H/23 * * *"
+#          testTargets: |
+#            - target: functional-multiuni-multiolt-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: bbsim-multiuni-multiolt-failurescenarios-att
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: bbsim-multiuni-multiolt-errorscenarios-att
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#          timeout: 180
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.11'
@@ -249,7 +313,34 @@
               logging: true
           timeout: 180
 
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          olts: 2
+          extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-multiuni-multiolt-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiuni-multiolt-failurescenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiuni-multiolt-errorscenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+          timeout: 180
+
+      # -----------------------------------------------------------------------
       # openonu Go periodic tests
+      # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim'
           code-branch: 'master'
@@ -359,73 +450,75 @@
               logging: true
           timeout: 240
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-openonu-go-test-bbsim-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          time-trigger: "H H/23 * * *"
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: mib-upload-templating-openonu-go-adapter-test
-              workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-passed-test
-              workflow: att
-              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-failed-test
-              workflow: att
-              flags: "--set omci_response_rate=7"
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-openonu-go-test-bbsim-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          time-trigger: "H H/23 * * *"
+#          logLevel: 'DEBUG'
+#          testTargets: |
+#            - target: 1t1gem-openonu-go-adapter-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t4gem-openonu-go-adapter-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t8gem-openonu-go-adapter-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: mib-upload-templating-openonu-go-adapter-test
+#              workflow: att
+#              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-test-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-test-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-test-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: openonu-go-adapter-omci-hardening-passed-test
+#              workflow: att
+##################              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+#              teardown: true
+#              logging: true
+#            - target: openonu-go-adapter-omci-hardening-failed-test
+#              workflow: att
+#              flags: "--set omci_response_rate=7"
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-single-kind-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-single-kind-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-single-kind-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim-2.11'
@@ -537,6 +630,117 @@
           timeout: 240
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-openonu-go-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          time-trigger: "H H/23 * * *"
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: mib-upload-templating-openonu-go-adapter-test
+              workflow: att
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-passed-test
+              workflow: att
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-failed-test
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-att
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-tt
+              workflow: tt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-robustness-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
+              teardown: true
+              logging: true
+            - target: onu-robustness-test-multi-uni-kind-tt
+              workflow: tt
+              flags: "--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF,kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
+              teardown: true
+              logging: true
+          timeout: 240
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
           name: 'patchset-voltha-openonu-go-test-bbsim'
           trigger-comment: "voltha test openonu singleolt"
           code-branch: '$GERRIT_BRANCH'
@@ -637,75 +841,75 @@
               logging: true
           timeout: 210
 
-      - 'voltha-periodic-test':
-          name: 'patchset-voltha-2.8-openonu-go-test-bbsim'
-          trigger-comment: "voltha 2.8 test openonu singleolt"
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: '$GERRIT_BRANCH'
-          gerritProject: '$GERRIT_PROJECT'
-          gerritRefspec: '$GERRIT_REFSPEC'
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: mib-upload-templating-openonu-go-adapter-test
-              workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-passed-test
-              workflow: att
-              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-failed-test
-              workflow: att
-              flags: "--set omci_response_rate=7"
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'patchset-voltha-2.8-openonu-go-test-bbsim'
+#          trigger-comment: "voltha 2.8 test openonu singleolt"
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: '$GERRIT_BRANCH'
+#          gerritProject: '$GERRIT_PROJECT'
+#          gerritRefspec: '$GERRIT_REFSPEC'
+#          logLevel: 'DEBUG'
+#          testTargets: |
+#            - target: 1t1gem-openonu-go-adapter-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t4gem-openonu-go-adapter-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t8gem-openonu-go-adapter-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: mib-upload-templating-openonu-go-adapter-test
+#              workflow: att
+#              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-test-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-test-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-test-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: openonu-go-adapter-omci-hardening-passed-test
+#              workflow: att
+##############              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+#              teardown: true
+#              logging: true
+#            - target: openonu-go-adapter-omci-hardening-failed-test
+#              workflow: att
+#              flags: "--set omci_response_rate=7"
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-single-kind-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-single-kind-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-single-kind-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
 
       - 'voltha-periodic-test':
           name: 'patchset-voltha-2.11-openonu-go-test-bbsim'
@@ -809,6 +1013,109 @@
           timeout: 210
 
       - 'voltha-periodic-test':
+          name: 'patchset-voltha-2.12-openonu-go-test-bbsim'
+          trigger-comment: "voltha 2.12 test openonu singleolt"
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: '$GERRIT_BRANCH'
+          gerritProject: '$GERRIT_PROJECT'
+          gerritRefspec: '$GERRIT_REFSPEC'
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: mib-upload-templating-openonu-go-adapter-test
+              workflow: att
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-passed-test
+              workflow: att
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-failed-test
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-att
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-tt
+              workflow: tt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+          timeout: 210
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
@@ -878,60 +1185,60 @@
           time-trigger: "H H/12 * * *"
           timeout: 270
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          extraHelmFlags: '--set onu=2,pon=2'
-          olts: 2
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          time-trigger: "H H/23 * * *"
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          extraHelmFlags: '--set onu=2,pon=2'
+#          olts: 2
+#          logLevel: 'DEBUG'
+#          testTargets: |
+#            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-multiolt-kind-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-multiolt-kind-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-multiolt-kind-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#          time-trigger: "H H/23 * * *"
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.11'
@@ -1005,6 +1312,79 @@
           timeout: 270
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          extraHelmFlags: '--set onu=2,pon=2'
+          olts: 2
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          time-trigger: "H H/23 * * *"
+          timeout: 270
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
           name: 'patchset-voltha-multiple-olts-openonu-go-test-bbsim'
           trigger-comment: "voltha test openonu multiolt"
           code-branch: '$GERRIT_BRANCH'
@@ -1076,62 +1456,62 @@
           olts: 2
           timeout: 270
 
-      - 'voltha-periodic-test':
-          name: 'patchset-voltha-2.8-multiple-olts-openonu-go-test-bbsim'
-          trigger-comment: "voltha 2.8 test openonu multiolt"
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: '$GERRIT_BRANCH'
-          gerritProject: '$GERRIT_PROJECT'
-          gerritRefspec: '$GERRIT_REFSPEC'
-          extraHelmFlags: '--set onu=2,pon=2'
-          olts: 2
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'patchset-voltha-2.8-multiple-olts-openonu-go-test-bbsim'
+#          trigger-comment: "voltha 2.8 test openonu multiolt"
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: '$GERRIT_BRANCH'
+#          gerritProject: '$GERRIT_PROJECT'
+#          gerritRefspec: '$GERRIT_REFSPEC'
+#          extraHelmFlags: '--set onu=2,pon=2'
+#          olts: 2
+#          logLevel: 'DEBUG'
+#          testTargets: |
+#            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-multiolt-kind-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-multiolt-kind-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-onu-omci-get-multiolt-kind-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
 
       - 'voltha-periodic-test':
           name: 'patchset-voltha-2.11-multiple-olts-openonu-go-test-bbsim'
@@ -1207,6 +1587,81 @@
           timeout: 270
 
       - 'voltha-periodic-test':
+          name: 'patchset-voltha-2.12-multiple-olts-openonu-go-test-bbsim'
+          trigger-comment: "voltha 2.12 test openonu multiolt"
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: '$GERRIT_BRANCH'
+          gerritProject: '$GERRIT_PROJECT'
+          gerritRefspec: '$GERRIT_REFSPEC'
+          extraHelmFlags: '--set onu=2,pon=2'
+          olts: 2
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 270
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
           name: 'patchset-voltha-pm-data-test-bbsim'
           trigger-comment: "voltha test pm data singleolt"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
@@ -1231,7 +1686,7 @@
               teardown: true
               logging: true
           timeout: 140
-
+## YY
 #-----------------------------------------------------------------------
 # Intent: Pipeline jobs refactored into voltha-e2e/votlha-x.1x
 # What to do with patchset-* (?)
@@ -1263,6 +1718,8 @@
           olts: 2
           timeout: 180
 
+      # -----------------------------------------------------------------------          
+      # -----------------------------------------------------------------------          
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-DMI'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
@@ -1275,17 +1732,17 @@
               teardown: true
               logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-DMI-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: bbsim-dmi-hw-management-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-test-DMI-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          time-trigger: "H H/23 * * *"
+#          testTargets: |
+#            - target: bbsim-dmi-hw-management-test
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-DMI-2.11'
@@ -1300,6 +1757,20 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-DMI-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: bbsim-dmi-hw-management-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+
+      # -----------------------------------------------------------------------          
+      # -----------------------------------------------------------------------          
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
@@ -1312,19 +1783,19 @@
               teardown: true
               logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-etcd-test-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          code-branch: 'voltha-2.8'
-          extraHelmFlags: '--set onu=2,pon=2'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: sanity-multi-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-etcd-test-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          build-node: 'ubuntu18.04-basebuild-4c-8g'
+#          code-branch: 'voltha-2.8'
+#          extraHelmFlags: '--set onu=2,pon=2'
+#          time-trigger: "H H/23 * * *"
+#          testTargets: |
+#            - target: sanity-multi-kind
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test-2.11'
@@ -1340,6 +1811,22 @@
               teardown: true
               logging: true
 
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-etcd-test-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          code-branch: 'voltha-2.12'
+          extraHelmFlags: '--set onu=2,pon=2'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: sanity-multi-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+
+      # -----------------------------------------------------------------------          
+      # -----------------------------------------------------------------------          
 #      - 'voltha-periodic-test':
 #          name: 'periodic-voltha-sanity-test-multi-runs'
 #          code-branch: 'master'
@@ -1436,6 +1923,8 @@
 #              teardown: false
 #              logging: true
 
+      # -----------------------------------------------------------------------          
+      # -----------------------------------------------------------------------          
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
@@ -1473,6 +1962,26 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-dt-test-bbsim-2.12'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          time-trigger: "@daily"
+          testTargets: |
+            - target: functional-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-failurescenarios-dt
+              workflow: dt
+              flags: ""
+              teardown: false
+              logging: true
+
+      # -----------------------------------------------------------------------          
+      # -----------------------------------------------------------------------          
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
@@ -1496,6 +2005,33 @@
               teardown: true
               logging: true
 
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          extraHelmFlags: '--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
+          time-trigger: "H H/23 * * *"
+          logLevel: 'DEBUG'
+          robot-args: '-v unitag_sub:True'
+          testTargets: |
+            - target: functional-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-failurescenarios-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: functional-single-kind-multiuni-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+
       - 'voltha-periodic-test':
           name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.11'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
@@ -1521,6 +2057,8 @@
               teardown: true
               logging: true
 
+      # -----------------------------------------------------------------------          
+      # -----------------------------------------------------------------------          
       - 'voltha-periodic-test':
           name: 'periodic-voltha-tt-maclearner-sanity-test-bbsim'
           code-branch: 'master'
@@ -1552,6 +2090,24 @@
               logging: true
           timeout: 230
 
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-memory-leak-test-bbsim-2.12'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          time-trigger: "H H/23 * * *"
+          withMonitoring: true
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: memory-leak-test-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 230
+
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
@@ -1568,6 +2124,8 @@
               logging: true
           timeout: 230
 
+      # -----------------------------------------------------------------------          
+      # -----------------------------------------------------------------------          
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-fttb-test-bbsim'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index e77f8fd..bf0340e 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -288,6 +288,33 @@
           withIgmp: true
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml"
 
+      # -----------------------------------------------------------------------
+      # voltha-2.12 Jobs
+      # -----------------------------------------------------------------------
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-voltha-2.12-2-16-32-att-subscribers'
+          pipeline-script: 'voltha/voltha-2.12/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          withEapol: true
+          withDhcp: true
+          withIgmp: false
+          release: voltha-2.12
+          karaf-home: 'apache-karaf-4.2.9'
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
 
       # voltha-2.11 Jobs
       - 'voltha-scale-measurements':
@@ -315,6 +342,34 @@
           onosImg: ''
           extraHelmFlags: "--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
 
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-voltha-2.12-2-16-32-dt-subscribers'
+          pipeline-script: 'voltha/voltha-2.12/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          release: voltha-2.12
+          karaf-home: 'apache-karaf-4.2.9'
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: 'voltha/voltha-onos:5.0.4'
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.11-2-16-32-dt-subscribers'
           pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
@@ -341,6 +396,36 @@
           onosImg: 'voltha/voltha-onos:5.0.4'
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
 
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-voltha-2.12-2-16-32-tt-subscribers'
+          pipeline-script: 'voltha/voltha-2.12/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          release: voltha-2.12
+          karaf-home: 'apache-karaf-4.2.9'
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.11-2-16-32-tt-subscribers'
           pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
@@ -367,6 +452,44 @@
           onosImg: ''
           extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
 
+      # -----------------------------------------------------------------------
+      # Multi-stack jobs
+      # -----------------------------------------------------------------------
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-2.12-10-stacks-2-16-32-att-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.12/voltha-scale-multi-stack.groovy'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          release: voltha-2.12
+          karaf-home: 'apache-karaf-4.2.9'
+          workflow: att
+          withEapol: true
+          withDhcp: true
+          withIgmp: false
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: 'voltha/voltha-onos:5.0.4'
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
       # 2.11 multi-stack jobs
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-att-subscribers'
@@ -401,6 +524,43 @@
           onosImg: 'voltha/voltha-onos:5.0.4'
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-2.12-10-stacks-2-16-32-dt-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.12/voltha-scale-multi-stack.groovy'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          release: voltha-2.12
+          karaf-home: 'apache-karaf-4.2.9'
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-dt-subscribers'
           build-node: 'voltha-scale-2'
@@ -434,6 +594,43 @@
           onosImg: ''
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-2.12-10-stacks-2-16-32-tt-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.12/voltha-scale-multi-stack.groovy'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          release: voltha-2.12
+          karaf-home: 'apache-karaf-4.2.9'
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
+      # -----------------------------------------------------------------------
+      # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-tt-subscribers'
           build-node: 'voltha-scale-2'
@@ -467,186 +664,189 @@
           onosImg: ''
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
+      # -----------------------------------------------------------------------
       # voltha-2.8 Jobs
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.8-2-16-32-att-subscribers'
-          pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          withEapol: true
-          withDhcp: true
-          withIgmp: false
-          release: voltha-2.8
-          karaf-home: 'apache-karaf-4.2.9'
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+      # -----------------------------------------------------------------------
+#      - 'voltha-scale-measurements':
+#          name: 'voltha-scale-measurements-voltha-2.8-2-16-32-att-subscribers'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
+#          build-node: 'voltha-scale-1'
+#          time-trigger: "H H/4 * * *"
+#          disable-job: true
+#          olts: 2
+#          pons: 16
+#          onus: 32
+#          withFlows: true
+#          provisionSubscribers: true
+#          withEapol: true
+#          withDhcp: true
+#          withIgmp: false
+#          release: voltha-2.8
+#          karaf-home: 'apache-karaf-4.2.9'
+#          bbsimImg: ''
+#          rwCoreImg: ''
+#          ofAgentImg: ''
+#          openoltAdapterImg: ''
+#          openonuAdapterImg: ''
+#          openonuAdapterGoImg: ''
+#          onosImg: ''
+########          extraHelmFlags: "--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
 
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.8-2-16-32-dt-subscribers'
-          pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          workflow: dt
-          withEapol: false
-          withDhcp: false
-          withIgmp: false
-          release: voltha-2.8
-          karaf-home: 'apache-karaf-4.2.9'
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: 'voltha/voltha-onos:5.0.4'
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+#      - 'voltha-scale-measurements':
+#          name: 'voltha-scale-measurements-voltha-2.8-2-16-32-dt-subscribers'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
+#          build-node: 'voltha-scale-1'
+#          time-trigger: "H H/4 * * *"
+#          disable-job: true
+#          olts: 2
+#          pons: 16
+#          onus: 32
+#          withFlows: true
+#          provisionSubscribers: true
+#          workflow: dt
+#          withEapol: false
+#          withDhcp: false
+#          withIgmp: false
+#          release: voltha-2.8
+#          karaf-home: 'apache-karaf-4.2.9'
+#          bbsimImg: ''
+#          rwCoreImg: ''
+#          ofAgentImg: ''
+#          openoltAdapterImg: ''
+#          openonuAdapterImg: ''
+#          openonuAdapterGoImg: ''
+#          onosImg: 'voltha/voltha-onos:5.0.4'
+#          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
 
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.8-2-16-32-tt-subscribers'
-          pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          workflow: tt
-          withEapol: false
-          withDhcp: true
-          withIgmp: true
-          release: voltha-2.8
-          karaf-home: 'apache-karaf-4.2.9'
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+#      - 'voltha-scale-measurements':
+#          name: 'voltha-scale-measurements-voltha-2.8-2-16-32-tt-subscribers'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-scale-test.groovy'
+#          build-node: 'voltha-scale-1'
+#          time-trigger: "H H/4 * * *"
+#          disable-job: true
+#          olts: 2
+#          pons: 16
+#          onus: 32
+#          withFlows: true
+#          provisionSubscribers: true
+#          workflow: tt
+#          withEapol: false
+#          withDhcp: true
+#          withIgmp: true
+#          release: voltha-2.8
+#          karaf-home: 'apache-karaf-4.2.9'
+#          bbsimImg: ''
+#          rwCoreImg: ''
+#          ofAgentImg: ''
+#          openoltAdapterImg: ''
+#          openonuAdapterImg: ''
+#          openonuAdapterGoImg: ''
+#          onosImg: ''
+#          extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
 
       # 2.8 multi-stack jobs
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-att-subscribers'
-          build-node: 'voltha-scale-2'
-          pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          withMonitoring: false
-          logLevel: WARN
-          onosReplicas: 1
-          atomixReplicas: 0
-          kafkaReplicas: 1
-          etcdReplicas: 1
-          volthaStacks: 10
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          release: voltha-2.8
-          karaf-home: 'apache-karaf-4.2.9'
-          workflow: att
-          withEapol: true
-          withDhcp: true
-          withIgmp: false
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: 'voltha/voltha-onos:5.0.4'
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+#      - 'voltha-scale-measurements':
+#          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-att-subscribers'
+#          build-node: 'voltha-scale-2'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
+#          time-trigger: "H H/4 * * *"
+#          disable-job: true
+#          withMonitoring: false
+#          logLevel: WARN
+#          onosReplicas: 1
+#          atomixReplicas: 0
+#          kafkaReplicas: 1
+#          etcdReplicas: 1
+#          volthaStacks: 10
+#          olts: 2
+#          pons: 16
+#          onus: 32
+#          withFlows: true
+#          provisionSubscribers: true
+#          release: voltha-2.8
+#          karaf-home: 'apache-karaf-4.2.9'
+#          workflow: att
+#          withEapol: true
+#          withDhcp: true
+#          withIgmp: false
+#          bbsimImg: ''
+#          rwCoreImg: ''
+#          ofAgentImg: ''
+#          openoltAdapterImg: ''
+#          openonuAdapterImg: ''
+#          openonuAdapterGoImg: ''
+#          onosImg: 'voltha/voltha-onos:5.0.4'
+#          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-dt-subscribers'
-          build-node: 'voltha-scale-2'
-          pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          withMonitoring: false
-          logLevel: WARN
-          onosReplicas: 1
-          atomixReplicas: 0
-          kafkaReplicas: 1
-          etcdReplicas: 1
-          volthaStacks: 10
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          release: voltha-2.8
-          karaf-home: 'apache-karaf-4.2.9'
-          workflow: dt
-          withEapol: false
-          withDhcp: false
-          withIgmp: false
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+#      - 'voltha-scale-measurements':
+#          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-dt-subscribers'
+#          build-node: 'voltha-scale-2'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
+#          time-trigger: "H H/4 * * *"
+#          disable-job: true
+#          withMonitoring: false
+#          logLevel: WARN
+#          onosReplicas: 1
+#          atomixReplicas: 0
+#          kafkaReplicas: 1
+#          etcdReplicas: 1
+#          volthaStacks: 10
+#          olts: 2
+#          pons: 16
+#          onus: 32
+#          withFlows: true
+#          provisionSubscribers: true
+#          release: voltha-2.8
+#          karaf-home: 'apache-karaf-4.2.9'
+#          workflow: dt
+#          withEapol: false
+#          withDhcp: false
+#          withIgmp: false
+#          bbsimImg: ''
+#          rwCoreImg: ''
+#          ofAgentImg: ''
+#          openoltAdapterImg: ''
+#          openonuAdapterImg: ''
+#          openonuAdapterGoImg: ''
+#          onosImg: ''
+#          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-tt-subscribers'
-          build-node: 'voltha-scale-2'
-          pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          withMonitoring: false
-          logLevel: WARN
-          onosReplicas: 1
-          atomixReplicas: 0
-          kafkaReplicas: 1
-          etcdReplicas: 1
-          volthaStacks: 10
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          release: voltha-2.8
-          karaf-home: 'apache-karaf-4.2.9'
-          workflow: tt
-          withEapol: false
-          withDhcp: true
-          withIgmp: true
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+#      - 'voltha-scale-measurements':
+#          name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-tt-subscribers'
+#          build-node: 'voltha-scale-2'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
+#          time-trigger: "H H/4 * * *"
+#          disable-job: true
+#          withMonitoring: false
+#          logLevel: WARN
+#          onosReplicas: 1
+#          atomixReplicas: 0
+#          kafkaReplicas: 1
+#          etcdReplicas: 1
+#          volthaStacks: 10
+#          olts: 2
+#          pons: 16
+#          onus: 32
+#          withFlows: true
+#          provisionSubscribers: true
+#          release: voltha-2.8
+#          karaf-home: 'apache-karaf-4.2.9'
+#          workflow: tt
+#          withEapol: false
+#          withDhcp: true
+#          withIgmp: true
+#          bbsimImg: ''
+#          rwCoreImg: ''
+#          ofAgentImg: ''
+#          openoltAdapterImg: ''
+#          openonuAdapterImg: ''
+#          openonuAdapterGoImg: ''
+#          onosImg: ''
+#          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
-      # 2.11 multi-stack jobs
+      # -----------------------------------------------------------------------
       # per patchset job
+      # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-patchset-1-16-32-att-subscribers'
           build-node: 'voltha-scale-1'
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index 583b324..353422a 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -108,153 +108,200 @@
           power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
-      # Certification (Radisys) pod with olt/onu - 2.11 version timer based job (ZZ)
-#      - 'build_voltha_pod_release_timer':
+      # -----------------------------------------------------------------------
+      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-certification-pod-3'
+          config-pod: 'menlo-certification-pod-radisys-3200g'
+          disable-job: false
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
+
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-certification-pod-3'
+          config-pod: 'menlo-certification-pod-radisys-3200g'
+          disable-job: false
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
+
+      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+#      - 'build_voltha_pod_test':
 #          build-node: 'menlo-certification-pod-3'
 #          config-pod: 'menlo-certification-pod-radisys-3200g'
 #          disable-job: false
-#          reinstall-olt: true
-#          release: '2.11'
-#          branch: 'voltha-2.11'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
 #          name-extension: '_DT'
 #          work-flow: 'DT'
+#          test-repo: 'voltha-system-tests'
 #          profile: '1T8GEM'
-#          time: '9'
-#          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-#          extraHelmFlags: "--set onos-classic.image.tag=master"
+#          power-switch: true
+#          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
-      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job (ZZ)
+      # -----------------------------------------------------------------------
+      # Certification (Radisys) pod with olt/onu - 2.11 version timer based job
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod-1'
+          config-pod: 'menlo-certification-pod-radisys-1600g'
+          disable-job: false
+          reinstall-olt: true
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '13'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+          extraHelmFlags: "--set onos-classic.image.tag=master"
+
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod-1'
+          config-pod: 'menlo-certification-pod-radisys-1600g'
+          disable-job: false
+          reinstall-olt: true
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '13'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+          extraHelmFlags: "--set onos-classic.image.tag=master"
+
+      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
 #      - 'build_voltha_pod_release_timer':
-#          build-node: 'menlo-certification-pod-3'
-#          config-pod: 'menlo-certification-pod-radisys-3200g'
+#          build-node: 'menlo-certification-pod-1'
+#          config-pod: 'menlo-certification-pod-radisys-1600g'
 #          disable-job: false
+##          reinstall-olt: true
+ #         release: '2.8'
+ #         branch: 'voltha-2.8'
+ #         name-extension: '_DT'
+ #         work-flow: 'DT'
+ #         profile: '1T8GEM'
+ #         time: '13'
+ #         pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+ #         extraHelmFlags: "--set onos-classic.image.tag=master"
+
+      # -----------------------------------------------------------------------
+      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-certification-pod-1'
+          config-pod: 'menlo-certification-pod-radisys-1600g'
+          disable-job: false
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
+
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-certification-pod-1'
+          config-pod: 'menlo-certification-pod-radisys-1600g'
+          disable-job: false
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
+
+      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+#      - 'build_voltha_pod_test':
+#          build-node: 'menlo-certification-pod-1'
+#          config-pod: 'menlo-certification-pod-radisys-1600g'
+#          disable-job: false
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_DT'
+#          work-flow: 'DT'
+#          test-repo: 'voltha-system-tests'
+#          profile: '1T8GEM'
+#          power-switch: true
+#          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+
+      # -----------------------------------------------------------------------
+      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
+      # -----------------------------------------------------------------------
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod-2'
+          config-pod: 'menlo-certification-pod-radisys-1600x'
+          disable-job: true
+          reinstall-olt: true
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '17'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+          extraHelmFlags: "--set onos-classic.image.tag=master"
+
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod-2'
+          config-pod: 'menlo-certification-pod-radisys-1600x'
+          disable-job: true
+          reinstall-olt: true
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '17'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+          extraHelmFlags: "--set onos-classic.image.tag=master"
+
+      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
+#      - 'build_voltha_pod_release_timer':
+#          build-node: 'menlo-certification-pod-2'
+#          config-pod: 'menlo-certification-pod-radisys-1600x'
+#          disable-job: true
 #          reinstall-olt: true
 #          release: '2.8'
 #          branch: 'voltha-2.8'
 #          name-extension: '_DT'
 #          work-flow: 'DT'
 #          profile: '1T8GEM'
-#          time: '9'
+#          time: '17'
 #          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 #          extraHelmFlags: "--set onos-classic.image.tag=master"
 
+      # -----------------------------------------------------------------------
       # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      # -----------------------------------------------------------------------
       - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: false
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
-
-      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: false
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
-
-      # Certification (Radisys) pod with olt/onu - 2.11 version timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-1'
-          config-pod: 'menlo-certification-pod-radisys-1600g'
-          disable-job: false
-          reinstall-olt: true
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '13'
-          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.tag=master"
-
-      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-1'
-          config-pod: 'menlo-certification-pod-radisys-1600g'
-          disable-job: false
-          reinstall-olt: true
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '13'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.tag=master"
-
-      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod-1'
-          config-pod: 'menlo-certification-pod-radisys-1600g'
-          disable-job: false
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
-
-      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod-1'
-          config-pod: 'menlo-certification-pod-radisys-1600g'
-          disable-job: false
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
-
-      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
-      - 'build_voltha_pod_release_timer':
           build-node: 'menlo-certification-pod-2'
           config-pod: 'menlo-certification-pod-radisys-1600x'
           disable-job: true
-          reinstall-olt: true
-          release: '2.11'
-          branch: 'voltha-2.11'
+          release: '2.12'
+          branch: 'voltha-2.12'
           name-extension: '_DT'
           work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          time: '17'
-          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.tag=master"
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
 
-      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-2'
-          config-pod: 'menlo-certification-pod-radisys-1600x'
-          disable-job: true
-          reinstall-olt: true
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '17'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.tag=master"
-
-      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'menlo-certification-pod-2'
           config-pod: 'menlo-certification-pod-radisys-1600x'
@@ -269,19 +316,17 @@
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
 
       # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod-2'
-          config-pod: 'menlo-certification-pod-radisys-1600x'
-          disable-job: true
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
-
-# [EOF]
+#      - 'build_voltha_pod_test':
+#          build-node: 'menlo-certification-pod-2'
+#          config-pod: 'menlo-certification-pod-radisys-1600x'
+#          disable-job: true
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_DT'
+#          work-flow: 'DT'
+#          test-repo: 'voltha-system-tests'
+#          profile: '1T8GEM'
+#          power-switch: true
+#          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
 # [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 30791ed..cf056b7 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -41,7 +41,7 @@
           profile: 'TP'
           name-extension: '_TT'
           work-flow: 'TT'
-# ZZ
+
       # flex pod1 test job - using voltha branch
       - 'build_voltha_pod_manual_test':
           disable-job: false
@@ -68,46 +68,19 @@
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
-      # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
-#      - 'build_voltha_pod_release_timer':
-#          disable-job: true
-#          build-node: 'qa-testvm-pod'
-#          config-pod: 'flex-ocp-cord'
-#          release: '2.11'
-#          branch: 'voltha-2.11'
-#          profile: '1T4GEM'
-#          time: '1'
-#          VolthaEtcdPort: 9999
-#          num-of-onos: '3'
-#          num-of-atomix: '3'
-#          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-
-    ## ZZ
-      # [VOL-4939] - flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
-#      - 'build_voltha_pod_release_timer':
-#          disable-job: true
-#          build-node: 'qa-testvm-pod'
-#          config-pod: 'flex-ocp-cord'
-#          release: '2.8'
-#          branch: 'voltha-2.8'
-#          profile: '1T4GEM'
-#          time: '1'
-#          VolthaEtcdPort: 9999
-#          num-of-onos: '3'
-#          num-of-atomix: '3'
-#          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-
-      # flex pod1 test job - released versions: uses tech profile on voltha branch
+      # -----------------------------------------------------------------------
+      # [VOL-4939] - flex pod1 test job - released versions: uses tech profile on voltha branch
+      # -----------------------------------------------------------------------
       - 'build_voltha_pod_test':
           disable-job: true
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
-          release: '2.8'
-          branch: 'voltha-2.8'
+          release: '2.12'
+          branch: 'voltha-2.12'
           power-switch: true
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM'
-
+          
       # [VOL-4939] - flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           disable-job: true
@@ -150,13 +123,32 @@
           profile: 'TP'
           timeout: 360
 
+      # -----------------------------------------------------------------------
       # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+#      - 'build_voltha_pod_release_timer':
+#          disable-job: true
+#          build-node: 'qa-testvm-pod'
+#          config-pod: 'flex-ocp-cord'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_TT'
+#          work-flow: 'TT'
+#          profile: 'TP'
+#          time: '20'
+#          VolthaEtcdPort: 9999
+#          num-of-onos: '3'
+#          num-of-atomix: '3'
+#          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+
+      # -----------------------------------------------------------------------
+      # [VOL-4939] - flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # -----------------------------------------------------------------------
       - 'build_voltha_pod_release_timer':
           disable-job: true
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
-          release: '2.8'
-          branch: 'voltha-2.8'
+          release: '2.12'
+          branch: 'voltha-2.12'
           name-extension: '_TT'
           work-flow: 'TT'
           profile: 'TP'
@@ -164,9 +156,8 @@
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
 
-      # [VOL-4939] - flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           disable-job: true
           build-node: 'qa-testvm-pod'
@@ -182,19 +173,21 @@
           num-of-atomix: '3'
           pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
 
+      # -----------------------------------------------------------------------
       # flex pod1 test job - released versions: uses tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
+      # -----------------------------------------------------------------------
+#      - 'build_voltha_pod_test':
+#          disable-job: true
+#          build-node: 'qa-testvm-pod'
+#          config-pod: 'flex-ocp-cord'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_TT'
+#          work-flow: 'TT'
+#          power-switch: true
+#          pipeline-script: 'voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy'
+#          test-repo: 'voltha-system-tests'
+#          profile: 'TP'
 
       # [VOL-4939] - flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -210,6 +203,21 @@
           test-repo: 'voltha-system-tests'
           profile: 'TP'
 
+      # [VOL-4939] - flex pod1 test job - released versions: uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
+
+      # -----------------------------------------------------------------------
       # [CORD-4941] - flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           disable-job: true
@@ -301,22 +309,23 @@
           power-switch: true
           power-cycle-olt: true
 
+      # -----------------------------------------------------------------------
       # Menlo pod with olt/onu - released branch,  Default tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          VolthaEtcdPort: 9999
-          in-band-management: true
-          time: '11'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+#      - 'build_voltha_pod_release_timer':
+#          build-node: 'menlo-demo-pod'
+#          config-pod: 'onf-demo-pod'
+#          disable-job: true
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_DT'
+#          work-flow: 'DT'
+#          profile: '1T8GEM'
+#          num-of-onos: '3'
+#          num-of-atomix: '3'
+#          VolthaEtcdPort: 9999
+#          in-band-management: true
+#          time: '11'
+#          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
       # Menlo pod with olt/onu - released branch,  Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
@@ -335,20 +344,38 @@
           time: '11'
           pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
 
-      # Menlo pod test job - uses tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          timeout: 300
+      # Menlo pod with olt/onu - released branch,  Default tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
           build-node: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'
-          disable-job: true
-          release: '2.8'
-          branch: 'voltha-2.8'
+          disable-job: false
+          release: '2.12'
+          branch: 'voltha-2.12'
           name-extension: '_DT'
           work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
-          power-switch: true
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          VolthaEtcdPort: 9999
+          in-band-management: true
+          time: '11'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+
+      # -----------------------------------------------------------------------
+      # Menlo pod test job - uses tech profile on voltha branch
+#      - 'build_voltha_pod_test':
+#          timeout: 300
+#          build-node: 'menlo-demo-pod'
+#          config-pod: 'onf-demo-pod'
+#          disable-job: true
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_DT'
+#          work-flow: 'DT'
+#          test-repo: 'voltha-system-tests'
+#          profile: '1T8GEM'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+#          power-switch: true
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -365,6 +392,22 @@
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
           power-switch: true
 
+      # Menlo pod test job - uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          timeout: 300
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          disable-job: false
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
+          power-switch: true
+
+      # -----------------------------------------------------------------------
       # ONF Menlo Soak POD build job - voltha-master branch
       - 'build_voltha_pod_manual':
           build-node: 'menlo-soak-pod'
@@ -427,21 +470,21 @@
           time-trigger: "H H * * 6"
 
       # ONF Menlo Soak POD build job - voltha-2.8 branch
-      - 'build_voltha_pod_manual':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true
-          branch: 'voltha-2.8'
-          release: '2.8'
-          bbsimReplicas: 1
-          profile: '1T8GEM'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          reinstall-olt: true
-          num-of-onus: 32
-          num-of-ponports: 16
-          logLevel: 'WARN'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+#      - 'build_voltha_pod_manual':
+#          build-node: 'menlo-soak-pod'
+#          config-pod: 'onf-soak-pod'
+#          disable-job: true
+#          branch: 'voltha-2.8'
+##          release: '2.8'
+ #         bbsimReplicas: 1
+ #         profile: '1T8GEM'
+ #         name-extension: '_DT'
+ #         work-flow: 'DT'
+ #         reinstall-olt: true
+ #         num-of-onus: 32
+ #         num-of-ponports: 16
+ #         logLevel: 'WARN'
+ #         pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
       # ONF Menlo Soak POD build job - voltha-2.11 branch
       - 'build_voltha_pod_manual':
@@ -460,20 +503,38 @@
           logLevel: 'WARN'
           pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
 
-      # ONF Menlo Soak POD test job - voltha-2.8 branch
-      # Run tests manually triggering the job
-      - 'build_voltha_pod_manual_test':
+      # ONF Menlo Soak POD build job - voltha-2.12 branch
+      - 'build_voltha_pod_manual':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
-          disable-job: true
+          disable-job: false
+          branch: 'voltha-2.12'
+          release: '2.12'
+          bbsimReplicas: 1
           profile: '1T8GEM'
-          branch: 'voltha-2.8'
-          release: '2.8'
+          name-extension: '_DT'
           work-flow: 'DT'
-          name-extension: '_DT_soak_Func'
-          test-type: 'Functional'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
+          reinstall-olt: true
+          num-of-onus: 32
+          num-of-ponports: 16
+          logLevel: 'WARN'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+
+      # -----------------------------------------------------------------------
+      # ONF Menlo Soak POD test job - voltha-2.8 branch
+      # Run tests manually triggering the job
+#      - 'build_voltha_pod_manual_test':
+#          build-node: 'menlo-soak-pod'
+#          config-pod: 'onf-soak-pod'
+#          disable-job: true
+#          profile: '1T8GEM'
+#          branch: 'voltha-2.8'
+#          release: '2.8'
+#          work-flow: 'DT'
+#          name-extension: '_DT_soak_Func'
+#          test-type: 'Functional'
+#          test-repo: 'voltha-system-tests'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
 
       # ONF Menlo Soak POD test job - voltha-2.11 branch
       # Run tests manually triggering the job
@@ -490,21 +551,37 @@
           test-repo: 'voltha-system-tests'
           pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
 
-      # ONF Menlo Soak POD test job - voltha-2.8 branch
-      # Run failure/recovery tests every Wednesday
-      - 'build_voltha_pod_soak_test':
+      # ONF Menlo Soak POD test job - voltha-2.12 branch
+      # Run tests manually triggering the job
+      - 'build_voltha_pod_manual_test':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
-          disable-job: true
+          disable-job: false
           profile: '1T8GEM'
-          branch: 'voltha-2.8'
-          release: '2.8'
+          branch: 'voltha-2.12'
+          release: '2.12'
           work-flow: 'DT'
-          name-extension: '_DT_soak_Fail'
-          test-type: 'Failure'
+          name-extension: '_DT_soak_Func'
+          test-type: 'Functional'
           test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H * * 3"
+          pipeline-script: 'voltha/voltha-2.12/voltha-physical-soak-dt-tests.groovy'
+
+      # -----------------------------------------------------------------------
+      # ONF Menlo Soak POD test job - voltha-2.8 branch
+      # Run failure/recovery tests every Wednesday
+#      - 'build_voltha_pod_soak_test':
+#          build-node: 'menlo-soak-pod'
+#          config-pod: 'onf-soak-pod'
+#          disable-job: true
+#          profile: '1T8GEM'
+#          branch: 'voltha-2.8'
+#          release: '2.8'
+#          work-flow: 'DT'
+#          name-extension: '_DT_soak_Fail'
+#          test-type: 'Failure'
+#          test-repo: 'voltha-system-tests'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
+#          time-trigger: "H H * * 3"
 
       # ONF Menlo Soak POD test job - voltha-2.11 branch
       # Run failure/recovery tests every Wednesday
@@ -522,21 +599,38 @@
           pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
           time-trigger: "H H * * 3"
 
-      # ONF Menlo Soak POD test job - voltha-2.8 branch
-      # Run dataplane tests every Saturday
+      # ONF Menlo Soak POD test job - voltha-2.12 branch
+      # Run failure/recovery tests every Wednesday
       - 'build_voltha_pod_soak_test':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
-          disable-job: true
+          disable-job: false
           profile: '1T8GEM'
-          branch: 'voltha-2.8'
-          release: '2.8'
+          branch: 'voltha-2.12'
+          release: '2.12'
           work-flow: 'DT'
-          name-extension: '_DT_soak_DP'
-          test-type: 'Dataplane'
+          name-extension: '_DT_soak_Fail'
+          test-type: 'Failure'
           test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H * * 6"
+          pipeline-script: 'voltha/voltha-2.12/voltha-physical-soak-dt-tests.groovy'
+          time-trigger: "H H * * 3"
+
+      # -----------------------------------------------------------------------
+      # ONF Menlo Soak POD test job - voltha-2.8 branch
+      # Run dataplane tests every Saturday
+#      - 'build_voltha_pod_soak_test':
+#          build-node: 'menlo-soak-pod'
+#          config-pod: 'onf-soak-pod'
+#          disable-job: true
+#          profile: '1T8GEM'
+#          branch: 'voltha-2.8'
+#          release: '2.8'
+#          work-flow: 'DT'
+#          name-extension: '_DT_soak_DP'
+#          test-type: 'Dataplane'
+#          test-repo: 'voltha-system-tests'
+#          pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
+#          time-trigger: "H H * * 6"
 
       # ONF Menlo Soak POD test job - voltha-2.11 branch
       # Run dataplane tests every Saturday
@@ -554,6 +648,23 @@
           pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
           time-trigger: "H H * * 6"
 
+      # ONF Menlo Soak POD test job - voltha-2.12 branch
+      # Run dataplane tests every Saturday
+      - 'build_voltha_pod_soak_test':
+          build-node: 'menlo-soak-pod'
+          config-pod: 'onf-soak-pod'
+          disable-job: false
+          profile: '1T8GEM'
+          branch: 'voltha-2.12'
+          release: '2.12'
+          work-flow: 'DT'
+          name-extension: '_DT_soak_DP'
+          test-type: 'Dataplane'
+          test-repo: 'voltha-system-tests'
+          pipeline-script: 'voltha/voltha-2.12/voltha-physical-soak-dt-tests.groovy'
+          time-trigger: "H H * * 6"
+
+      # -----------------------------------------------------------------------
       # Berlin pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
@@ -611,19 +722,19 @@
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-gpon'
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          disable-job: true
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          time: '1'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+#      - 'build_voltha_pod_release_timer':
+#          build-node: 'berlin-community-pod-1'
+#          config-pod: 'berlin-community-pod-1-gpon'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_DT'
+#          disable-job: true
+#          work-flow: 'DT'
+#          profile: '1T8GEM'
+#          num-of-onos: '3'
+#          num-of-atomix: '3'
+#          time: '1'
+#          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
@@ -639,19 +750,34 @@
           time: '1'
           pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
 
-      # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
+      # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
           config-pod: 'berlin-community-pod-1-gpon'
+          release: '2.12'
+          branch: 'voltha-2.12'
           name-extension: '_DT'
-          disable-job: true
           work-flow: 'DT'
-          release: '2.8'
-          branch: 'voltha-2.8'
-          test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          time: '1'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+
+      # -----------------------------------------------------------------------
+      # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+#      - 'build_voltha_pod_test':
+#          build-node: 'berlin-community-pod-1'
+#          config-pod: 'berlin-community-pod-1-gpon'
+#          name-extension: '_DT'
+#          disable-job: true
+#          work-flow: 'DT'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          test-repo: 'voltha-system-tests'
+#          profile: '1T8GEM'
+#          power-switch: true
+#          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
       # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -666,20 +792,34 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
 
-      # Berlin pod with olt/onu - voltha-2.8 versions timer based job , two OLTs
-      - 'build_voltha_pod_release_timer':
+      # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
           build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-multi-olt'
+          config-pod: 'berlin-community-pod-1-gpon'
           name-extension: '_DT'
-          disable-job: true
           work-flow: 'DT'
-          release: '2.8'
-          branch: 'voltha-2.8'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-          time: '7'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
+
+      # -----------------------------------------------------------------------
+      # Berlin pod with olt/onu - voltha-2.8 versions timer based job , two OLTs
+#      - 'build_voltha_pod_release_timer':
+#          build-node: 'berlin-community-pod-1'
+#          config-pod: 'berlin-community-pod-1-multi-olt'
+#          name-extension: '_DT'
+#          disable-job: true
+#          work-flow: 'DT'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          profile: '1T8GEM'
+#          num-of-onos: '3'
+#          num-of-atomix: '3'
+#          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+#          time: '7'
 
       # Berlin pod with olt/onu - voltha-2.11 versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
@@ -695,19 +835,34 @@
           pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
           time: '7'
 
-      # Berlin POD test job - voltha-2.8 versions: uses tech profile on voltha branch
-      - 'build_voltha_pod_test':
+      # Berlin pod with olt/onu - voltha-2.12 versions timer based job , two OLTs
+      - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
           config-pod: 'berlin-community-pod-1-multi-olt'
-          release: '2.8'
-          branch: 'voltha-2.8'
           name-extension: '_DT'
-          disable-job: true
           work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
+          release: '2.12'
+          branch: 'voltha-2.12'
           profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+          time: '7'
+
+      # -----------------------------------------------------------------------
+      # Berlin POD test job - voltha-2.8 versions: uses tech profile on voltha branch
+#      - 'build_voltha_pod_test':
+#          build-node: 'berlin-community-pod-1'
+#          config-pod: 'berlin-community-pod-1-multi-olt'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_DT'
+#          disable-job: true
+#          work-flow: 'DT'
+#          test-repo: 'voltha-system-tests'
+#          profile: '1T8GEM'
+#          power-switch: true
+#          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
       # Berlin POD test job - voltha-2.11 versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -722,6 +877,20 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
 
+      # Berlin POD test job - voltha-2.12 versions: uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-multi-olt'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
+
+      # -----------------------------------------------------------------------
       # Berlin pod with gpon olt/onu - master 1T4GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
@@ -767,6 +936,23 @@
           time: '13'
           pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
 
+      # Berlin pod with gpon olt/onu - 2.12 1T4GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-fttb'
+          withFttb: true
+          name-extension: '_DT'
+          disable-job: false
+          work-flow: 'DT'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          profile: '1T4GEM-FTTB'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          time: '13'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+
+      # -----------------------------------------------------------------------          
       # Berlin POD test job - 2.11 versions: uses 1T4GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 330
@@ -783,6 +969,22 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
 
+      # Berlin POD test job - 2.12 versions: uses 1T4GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          timeout: 330
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-fttb'
+          withFttb: true
+          name-extension: '_DT'
+          disable-job: false
+          work-flow: 'DT'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          test-repo: 'voltha-system-tests'
+          profile: '1T4GEM-FTTB'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
+          
           # Berlin pod with zyxel gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-2'
@@ -907,6 +1109,7 @@
           profile: 'TP'
           timeout: 360
 
+      # -----------------------------------------------------------------------
       # [CORD-3256] TT workflow on XGSPON OLT at Berlin pod - build job
       - 'build_voltha_pod_release_timer':
           disable-job: false
@@ -922,6 +1125,22 @@
           num-of-onos: '3'
           num-of-atomix: '3'
 
+      # [CORD-3256] TT workflow on XGSPON OLT at Berlin pod - build job
+      - 'build_voltha_pod_release_timer':
+          disable-job: false
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon'
+          release: 'voltha-2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          profile: 'TP'
+          time: '10'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+
+      # -----------------------------------------------------------------------
       # [CORD-3256] TT workflow on GPON OLT at Berlin pod - test job
       - 'build_voltha_pod_test':
           disable-job: false
@@ -938,6 +1157,22 @@
           profile: 'TP'
           timeout: 360
 
+      # [CORD-3256] TT workflow on GPON OLT at Berlin pod - test job
+      - 'build_voltha_pod_test':
+          disable-job: false
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon'
+          release: 'voltha-2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: true
+          power-cycle-olt: false
+          pipeline-script: 'voltha/voltha-2.12/voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
+          timeout: 360
+
       # TT workflow on Zyxel GPON OLT at Berlin pod - build job (playground)
       - 'build_voltha_pod_release_timer_playground':
           disable-job: false
@@ -969,26 +1204,27 @@
           profile: 'TP'
           timeout: 360
 
+      # -----------------------------------------------------------------------
       # Berlin pod with adtran gpon olt/onu - 2.8 1T8GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-gpon-adtran'
-          name-extension: '_DT'
-          disable-job: true
-          work-flow: 'DT'
-          release: '2.8'
-          branch: 'voltha-2.8'
-          profile: '1T8GEM'
-          reinstall-olt: false
-          extraHelmFlags: "--set adapter_adtran_olt.kv_store_data_prefix='service/voltha/voltha_voltha' --set network.netconfUserSecret='' --set adapter_adtran_olt.topics.core_topic=voltha_voltha_rwcore"
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-          VolthaEtcdPort: 9999
-          openoltAdapterChart: '/home/community/adtran-21.5-voltha-2.8/voltha-adapter-adtran-olt'
-          oltAdapterReleaseName: 'adtran-olt'
-          waitTimerForOltUp: 420
-          time: '19'
+#      - 'build_voltha_pod_release_timer':
+#          build-node: 'berlin-community-pod-1'
+#          config-pod: 'berlin-community-pod-1-gpon-adtran'
+#          name-extension: '_DT'
+#          disable-job: true
+#          work-flow: 'DT'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          profile: '1T8GEM'
+#          reinstall-olt: false
+#          extraHelmFlags: "--set adapter_adtran_olt.kv_store_data_prefix='service/voltha/voltha_volth#a' --set network.netconfUserSecret='' --set adapter_adtran_olt.topics.core_topic=voltha_voltha_rwcore#"
+#          num-of-onos: '3'
+#          num-of-atomix: '3'
+#          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+#          VolthaEtcdPort: 9999
+#          openoltAdapterChart: '/home/community/adtran-21.5-voltha-2.8/voltha-adapter-adtran-olt'
+#          oltAdapterReleaseName: 'adtran-olt'
+#          waitTimerForOltUp: 420
+#          time: '19'
 
       # Berlin pod with adtran gpon olt/onu - 2.11 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
@@ -1010,21 +1246,42 @@
           waitTimerForOltUp: 420
           time: '19'
 
-      # Berlin POD adtran test job - 2.8 versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          timeout: 390
+      # Berlin pod with adtran gpon olt/onu - 2.12 1T8GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
           config-pod: 'berlin-community-pod-1-gpon-adtran'
-          release: '2.8'
-          branch: 'voltha-2.8'
           name-extension: '_DT'
-          disable-job: true
           work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
+          release: '2.12'
+          branch: 'voltha-2.12'
           profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
-          oltAdapterAppLabel: 'adapter-adtran-olt'
+          reinstall-olt: false
+          extraHelmFlags: "--set adapter_adtran_olt.kv_store_data_prefix='service/voltha/voltha_voltha' --set network.netconfUserSecret='' --set adapter_adtran_olt.topics.core_topic=voltha_voltha_rwcore"
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+          VolthaEtcdPort: 9999
+          openoltAdapterChart: '/home/community/adtran-21.5-voltha-2.12/voltha-adapter-adtran-olt'
+          oltAdapterReleaseName: 'adtran-olt'
+          waitTimerForOltUp: 420
+          time: '19'
+
+      # -----------------------------------------------------------------------
+      # Berlin POD adtran test job - 2.8 versions: uses 1T8GEM tech profile on voltha branch
+#      - 'build_voltha_pod_test':
+#          timeout: 390
+#          build-node: 'berlin-community-pod-1'
+#          config-pod: 'berlin-community-pod-1-gpon-adtran'
+#          release: '2.8'
+#          branch: 'voltha-2.8'
+#          name-extension: '_DT'
+#          disable-job: true
+#          work-flow: 'DT'
+#          test-repo: 'voltha-system-tests'
+#          profile: '1T8GEM'
+#          power-switch: true
+#          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+#          oltAdapterAppLabel: 'adapter-adtran-olt'
 
       # Berlin POD adtran test job - 2.11 versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -1041,6 +1298,22 @@
           pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
           oltAdapterAppLabel: 'adapter-adtran-olt'
 
+      # Berlin POD adtran test job - 2.12 versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          timeout: 390
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-adtran'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.12/voltha-dt-physical-functional-tests.groovy'
+          oltAdapterAppLabel: 'adapter-adtran-olt'
+
+      # -----------------------------------------------------------------------
       # Berlin pod with adtran gpon olt/onu - 1T8GEM tech profile and timer based job
       - 'verify_voltha_pod_dmi_test':
           build-node: 'berlin-community-pod-1'
@@ -1064,7 +1337,9 @@
           waitTimerForOltUp: 420
           time: '16'
 
+      # -----------------------------------------------------------------------
       # Berlin pod with adtran gpon olt/onu - 2.11 1T8GEM tech profile and timer based job
+      # -----------------------------------------------------------------------
       - 'verify_voltha_pod_dmi_test':
           build-node: 'berlin-community-pod-1'
           config-pod: 'berlin-community-pod-1-gpon-adtran'
@@ -1087,4 +1362,27 @@
           waitTimerForOltUp: 420
           time: '16'
 
+      # Berlin pod with adtran gpon olt/onu - 2.12 1T8GEM tech profile and timer based job
+      - 'verify_voltha_pod_dmi_test':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-adtran'
+          name-extension: '_DT'
+          disable-job: false
+          work-flow: 'DT'
+          release: '2.12'
+          branch: 'voltha-2.12'
+          profile: 'Default'
+          installVolthaInfra: true
+          installVolthaStack: false
+          reinstall-olt: false
+          restart-olt: false
+          extraHelmFlags: " -f /home/community/SDX_Device_Manager_21.4/helm/values-onf.yaml "
+          dmiChart: '/home/community/SDX_Device_Manager_21.4/helm/adtran-olt-device-manager'
+          OltDevMgr: 'adtran-olt-device-manager'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          VolthaEtcdPort: 9999
+          waitTimerForOltUp: 420
+          time: '16'
+
 # [EOF]