diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
index 28ec08e..2a63d1c 100644
--- a/jjb/repos/voltha-helm-charts.yaml
+++ b/jjb/repos/voltha-helm-charts.yaml
@@ -18,10 +18,6 @@
           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-master':
           branch-regexp: '^master$'
 
@@ -53,10 +49,4 @@
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
 
-# - 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 4a83bcc..7f2dd34 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -133,37 +133,6 @@
           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
 # -----------------------------------------------------------------------
@@ -778,209 +747,4 @@
                  TZ=America/Los_Angeles
                  {time-trigger}
 
-# -----------------------------------------------------------------------
-# to be used for voltha release 2.8
-# -----------------------------------------------------------------------
-# - 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.yaml b/jjb/verify/bbsim.yaml
index 5702889..a5a8f55 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -55,29 +55,6 @@
           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-master'
     jobs:
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 8c480a7..15cf065 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -18,10 +18,6 @@
           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}'
       - 'publish-ofagent-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -30,8 +26,7 @@
     jobs:
       - 'verify-licensed'
       - 'make-unit-test':
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
@@ -57,12 +52,6 @@
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
 
-# - 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'
     jobs:
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index f30944c..02f9104 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -18,10 +18,6 @@
           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$'
       - 'publish-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -59,12 +55,6 @@
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
 
-# - 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'
     jobs:
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index c984e1f..c335c9b 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -10,14 +10,10 @@
           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.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'publish-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -31,22 +27,21 @@
           unit-test-targets: 'lint sca'
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           name-extension: "-tests"
           unit-test-targets: 'test'
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
-          # build-node: 'ubuntu18.04-basebuild-2c-4g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          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'
+          extraHelmFlags: >
+            --set global.image_tag=master --set onos-classic.image.tag=master
 
 - job-group:
     name: 'verify-voltha-openolt-adapter-jobs-voltha-2.12'
@@ -54,24 +49,6 @@
       - 'voltha-patch-test':
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'master'
-          # pipeline-script: 'voltha/bbsim-tests.groovy'
-          # pipeline-branch: 'voltha-2.12'
-
-# -----------------------------------------------------------------------
-# Directory based branch test suites were removed when consultants moved
-# all testing onto master and bulk disabled failing suites to try and
-# get the job queue clean.
-#
-# Since release testing can no longer be initiated by parameterized
-# cron jobs a new set of jobs that will checkout release branch and
-# run testing to validate hotfixes will need to be created.
-# -----------------------------------------------------------------------
-#- job-group:
-#    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.11'
-#    jobs:
-#      - 'voltha-patch-test':
-#          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-#          pipeline-branch: 'voltha-2.11'
 
 - 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 38af390..5a920d4 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -18,10 +18,6 @@
           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$'
       - 'publish-voltha-openonu-adapter-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -35,8 +31,7 @@
           unit-test-targets: 'lint sca'
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           name-extension: "-tests"
@@ -59,12 +54,6 @@
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
 
-#- 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'
     jobs:
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 44f7449..bb7e979 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -7,30 +7,21 @@
 
     jobs:
       - 'verify-voltha-system-tests-jobs':
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          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'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          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'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          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'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          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$'
 
 - job-group:
     name: 'verify-voltha-system-tests-jobs'
@@ -55,12 +46,6 @@
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
 
-#- 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'
     jobs:
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 6b85f6c..7ca459f 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -74,35 +74,6 @@
               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'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
@@ -211,31 +182,6 @@
               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.12'
           pipeline-script: 'voltha/bbsim-tests.groovy'
@@ -284,33 +230,6 @@
               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.11'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
@@ -475,76 +394,6 @@
               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.11'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
@@ -868,76 +717,6 @@
               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.11-openonu-go-test-bbsim'
           trigger-comment: "voltha 2.11 test openonu singleolt"
@@ -1214,61 +993,6 @@
           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.11'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
@@ -1487,63 +1211,6 @@
           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.11-multiple-olts-openonu-go-test-bbsim'
           trigger-comment: "voltha 2.11 test openonu multiolt"
@@ -1765,18 +1432,6 @@
               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'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
@@ -1807,8 +1462,7 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           time-trigger: "H H/12 * * *"
@@ -1819,26 +1473,11 @@
               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'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'voltha-2.11'
           extraHelmFlags: '--set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
@@ -1853,8 +1492,7 @@
           name: 'periodic-voltha-etcd-test-2.12'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'voltha-2.12'
           extraHelmFlags: '--set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
@@ -1964,8 +1602,7 @@
       # Attention: Due VOL-4703 is not corrected memory leak tests will run in pipeline for DT workflow only!
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,controlledActivation=only-onu'
@@ -1983,8 +1620,7 @@
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.12'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
           code-branch: 'voltha-2.12'
@@ -2001,8 +1637,7 @@
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
           code-branch: 'voltha-2.11'
@@ -2030,112 +1665,6 @@
               teardown: true
               logging: true
 
-      # ATT Per-patchset Pod builds on Tucson pod (master)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_auto':
-      #    name: 'verify_physical_voltha_patchset_auto'
-      #    extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
-      #    workflow: 'att'
-      #    branch-pattern: master
-
-
-      # ATT Per-patchset Pod builds on Tucson pod (voltha-2.8)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_auto':
-      #    name: 'verify_physical_voltha_patchset_auto-2.8'
-      #    pipeline-script: 'voltha/voltha-2.8/tucson-build-and-test.groovy'
-      #    extraHelmFlags: '--set global.log_level=debug'
-      #    workflow: 'att'
-      #    branch-pattern: voltha-2.8
-
-      # ATT Per-patchset Pod builds on Tucson pod (voltha-2.11)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_auto':
-      #    name: 'verify_physical_voltha_patchset_auto-2.11'
-      #    pipeline-script: 'voltha/voltha-2.11/tucson-build-and-test.groovy'
-      #    extraHelmFlags: '--set global.log_level=debug'
-      #    workflow: 'att'
-      #    branch-pattern: voltha-2.11
-
-      # ATT Manual Pod builds on Tucson pod (master)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_manual':
-      #    name: 'verify_physical_voltha_patchset_manual'
-      #    trigger-string: 'hardware test'
-      #    branch-pattern: master
-      #    extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
-      #    workflow: 'att'
-
-      # ATT Manual Pod builds on Tucson pod (voltha-2.8)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_manual':
-      #    name: 'verify_physical_voltha_patchset_manual-2.8'
-      #    pipeline-script: 'voltha/voltha-2.8/tucson-build-and-test.groovy'
-      #    trigger-string: 'hardware test'
-      #    branch-pattern: voltha-2.8
-      #    extraHelmFlags: '--set global.log_level=debug'
-      #    workflow: 'att'
-
-      # ATT Manual Pod builds on Tucson pod (voltha-2.11)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_manual':
-      #    name: 'verify_physical_voltha_patchset_manual-2.11'
-      #    pipeline-script: 'voltha/voltha-2.11/tucson-build-and-test.groovy'
-      #    trigger-string: 'hardware test'
-      #    branch-pattern: voltha-2.11
-      #    extraHelmFlags: '--set global.log_level=debug'
-      #    workflow: 'att'
-
-      # DT Manual Pod builds on Tucson pod  (master)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_manual':
-      #    name: 'verify_physical_voltha_patchset_manual_DT'
-      #    workflow: 'dt'
-      #    trigger-string: 'DT hardware test'
-      #    default-test-args: '-i sanityDt -i PowerSwitch -X'
-      #    branch-pattern: master
-      #    extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
-
-      # DT Manual Pod builds on Tucson pod  (voltha-2.8)
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_manual':
-      #    name: 'verify_physical_voltha_patchset_manual_DT-2.8'
-      #    pipeline-script: 'voltha/voltha-2.8/tucson-build-and-test.groovy'
-      #    workflow: 'dt'
-      #    trigger-string: 'DT hardware test'
-      #    default-test-args: '-i sanityDt -i PowerSwitch -X'
-      #    branch-pattern: voltha-2.8
-      #    extraHelmFlags: '--set global.log_level=debug'
-      # DT Manual Pod builds on Tucson pod  (voltha-2.8)
-
-      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
-      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
-      # the job when the OLT is replaced and everything works fine.
-      # - 'verify_physical_voltha_patchset_manual':
-      #    name: 'verify_physical_voltha_patchset_manual_DT-2.11'
-      #    pipeline-script: 'voltha/voltha-2.11/tucson-build-and-test.groovy'
-      #    workflow: 'dt'
-      #    trigger-string: 'DT hardware test'
-      #    default-test-args: '-i sanityDt -i PowerSwitch -X'
-      #    branch-pattern: voltha-2.11
-      #    extraHelmFlags: '--set global.log_level=debug'
-
 - job-template:
     id: 'voltha-periodic-test'
     name: '{name}'
@@ -2579,47 +2108,6 @@
           default: '{extraHelmFlags}'
           description: 'Helm flags (passed to each helm command)'
 
-      # deprecated parameters, remove after VOLTHA-2.8 is released
-      - string:
-          name: deploymentConfigFile
-          default: 'pod-configs/deployment-configs/{config-pod}.yaml'
-          description: 'Path of deployment config file'
-
-      - string:
-          name: kindVolthaValuesFile
-          default: 'pod-configs/kubernetes-configs/voltha/{config-pod}.yml'
-          description: 'Path of kind-voltha values override file'
-
-      - string:
-          name: manifestUrl
-          default: '{gerrit-server-url}/{voltha-test-manifest-repo}'
-          description: 'URL to the repo manifest'
-
-      - string:
-          name: gerritChangeNumber
-          default: '$GERRIT_CHANGE_NUMBER'
-          description: 'Changeset number in Gerrit'
-
-      - string:
-          name: gerritPatchsetNumber
-          default: '$GERRIT_PATCHSET_NUMBER'
-          description: 'PatchSet number in Gerrit'
-
-      - string:
-          name: localConfigDir
-          default: null
-          description: 'If specified, config file paths are relative to this dir; otherwise $WORKSPACE'
-
-      - string:
-          name: configRepo
-          default: 'pod-configs'
-          description: 'A repository containing the config files, will be checked out if specified'
-
-      - string:
-          name: manualBranch
-          default: '{manualBranch}'
-          description: "If a non-empty string, build manually as a specific branch, not with a specific patchset"
-
 - job-template:
     name: '{name}'
     id: verify_physical_voltha_patchset_auto
@@ -2661,7 +2149,6 @@
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
 
-
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
diff --git a/jjb/voltha-e2e/voltha-2.8.yaml b/jjb/voltha-e2e/voltha-2.8.yaml
deleted file mode 100644
index f7d3227..0000000
--- a/jjb/voltha-e2e/voltha-2.8.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
----
-# voltha 2.0 tests
-# Force regeneration: ee6c143b23ae6acbade0ddcb6965bff3c757dd5a
-
-- project:
-    name: voltha-e2e-2.8
-
-    project-name: '{name}'
-    manualBranch: ''
-    olts: 1
-    onus: 1
-    pons: 1
-    withAlarms: true
-    make-target-failtest: bbsim-failurescenarios
-    make-target-errortest: bbsim-errorscenarios
-    make-target-alarmtest: bbsim-alarms-kind
-    make-target-multipleolt: bbsim-multiolt-kind
-    make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
-    make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
-    make-target-reconciletest: reconcile-openonu-go-adapter-test-att
-    make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
-    make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
-
-    # source: voltha-e2e.yaml
-    jobs:
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-pm-data-test-bbsim-2.8-playground'
-          disable-job: true
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.8'
-          code-branch: 'voltha-2.8'
-          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-          time-trigger: "H H/23 * * *"
-          logLevel: 'INFO'
-          testTargets: |
-            - target: voltha-pm-data-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          timeout: 140
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.8'
-          disable-job: true
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.8'
-          code-branch: 'voltha-2.8'
-          extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-          olts: 2
-          timeout: 180
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: voltha-pm-data-multiolt-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-multiolt-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-multiolt-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          time-trigger: "H H/23 * * *"
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-2.8'
-          disable-job: true                 # Reason: deprecated legacy build
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.8'
-          code-branch: 'voltha-2.8'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-single-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-alarms-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-multi-runs-2.8'
-          disable-job: true
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.8'
-          code-branch: 'voltha-2.8'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
-# [EOF]
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index fddf00c..4786047 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -681,186 +681,6 @@
           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-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"
-
-      # 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-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 "
-
-      # -----------------------------------------------------------------------
       # per patchset job
       # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':
@@ -1175,21 +995,6 @@
           default: '{testTimeout}'
           description: 'How long the scale test can run for in minutes, e.g 10, 15'
 
-      # remove once voltha-2.6 is deprecated
-      - string:
-          name: kindVolthaChange
-          default: '{kindVolthaChange}'
-          description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
-
-      - bool:
-          name: withMibTemplate
-          default: '{withMibTemplate}'
-
-      - string:
-          name: mibTemplateUrl
-          default: '{mibTemplateUrl}'
-          description: 'URL of the MIB template file to use, if "withMibTemplate" is selected'
-
 - job-template:
     id: 'voltha-scale-measurements'
     name: '{name}'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 62b0dfa..ca6e064 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -85,132 +85,6 @@
           power-switch: true
           pipeline-script: 'voltha/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'
-          disable-job: true
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-branch: 'voltha-2.11'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          time: '1'
-          pipeline-script: 'voltha/voltha-2.11/physical-build.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'
-          disable-job: true
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-branch: 'voltha-2.12'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-branch: 'voltha-2.11'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-branch: 'voltha-2.12'
-          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 olt/onu - voltha-2.11 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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-branch: 'voltha-2.11'
-          profile: '1T8GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-          time: '7'
-
-      # 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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-branch: 'voltha-2.12'
-          profile: '1T8GEM'
-          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.11 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'
-          disable-job: true
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-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'
-
-      # 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'
-          disable-job: true
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-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':
@@ -242,75 +116,6 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-dt-physical-functional-tests.groovy'
 
-      # Berlin pod with gpon olt/onu - 2.11 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'
-          disable-job: true
-          withFttb: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-branch: 'voltha-2.11'
-          profile: '1T4GEM-FTTB'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          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'
-          disable-job: true
-          withFttb: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-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
-          build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-gpon-fttb'
-          disable-job: true
-          withFttb: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-branch: 'voltha-2.11'
-          test-repo: 'voltha-system-tests'
-          profile: '1T4GEM-FTTB'
-          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'
-          disable-job: true
-          withFttb: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-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'
@@ -441,74 +246,6 @@
           profile: 'TP'
           timeout: 360
 
-      # -----------------------------------------------------------------------
-      # [CORD-3256] TT workflow on XGSPON OLT at Berlin pod - build job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-gpon'
-          disable-job: true
-          release: 'voltha-2.11'
-          branch: 'voltha-2.11'
-          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-          pipeline-branch: 'voltha-2.11'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '10'
-          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':
-          build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-gpon'
-          disable-job: true
-          release: 'voltha-2.12'
-          branch: 'voltha-2.12'
-          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
-          pipeline-branch: 'voltha-2.12'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '10'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-
-      # -----------------------------------------------------------------------
-      # [CORD-3256] TT workflow on GPON OLT at Berlin pod - test job
-      - 'build_voltha_pod_test':
-          build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-gpon'
-          disable-job: true
-          release: 'voltha-2.11'
-          branch: 'voltha-2.11'
-          pipeline-branch: 'voltha-2.11'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          power-cycle-olt: false
-          pipeline-script: 'voltha/voltha-2.11/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-          timeout: 360
-
-      # [CORD-3256] TT workflow on GPON OLT at Berlin pod - test job
-      - 'build_voltha_pod_test':
-          build-node: 'berlin-community-pod-1'
-          config-pod: 'berlin-community-pod-1-gpon'
-          disable-job: true
-          release: 'voltha-2.12'
-          branch: 'voltha-2.12'
-          pipeline-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':
           build-node: 'berlin-community-pod-1'
@@ -541,49 +278,6 @@
           profile: 'TP'
           timeout: 360
 
-      # -----------------------------------------------------------------------
-      # Berlin pod with adtran gpon olt/onu - 2.11 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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-branch: 'voltha-2.11'
-          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.11/physical-build.groovy'
-          openoltAdapterChart: '/home/community/adtran-23.1-voltha-2.11/voltha-adapter-adtran-olt'
-          oltAdapterReleaseName: 'adtran-olt'
-          waitTimerForOltUp: 420
-          time: '19'
-
-      # 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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-branch: 'voltha-2.12'
-          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.12/physical-build.groovy'
-          openoltAdapterChart: '/home/community/adtran-23.1-voltha-2.12/voltha-adapter-adtran-olt'
-          oltAdapterReleaseName: 'adtran-olt'
-          waitTimerForOltUp: 420
-          time: '19'
-
       # Berlin pod with adtran gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
@@ -605,41 +299,6 @@
           waitTimerForOltUp: 420
           time: '19'
 
-      # -----------------------------------------------------------------------
-      # Berlin POD adtran test job - 2.11 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'
-          disable-job: true
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-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'
-          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'
-          disable-job: true
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-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 adtran test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 390
@@ -681,54 +340,4 @@
           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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          pipeline-script: 'voltha/voltha-2.11/dmi-build-and-test.groovy'
-          pipeline-branch: 'voltha-2.11'
-          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'
-          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'
-          disable-job: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          pipeline-script: 'voltha/voltha-2.12/dmi-build-and-test.groovy'
-          pipeline-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'
-          waitTimerForOltUp: 420
-          time: '16'
-
 # [EOF]