diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
deleted file mode 100644
index 5beb4fc..0000000
--- a/jjb/voltha-test/voltha-certification.yaml
+++ /dev/null
@@ -1,178 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-
-- project:
-    name: voltha-certification-jobs
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: 1
-    num-of-onos: 1
-    num-of-atomix: 1
-    num-of-kafka: 1
-    num-of-etcd: 1
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      
-      # branches moved, master.yaml jobs retained here for now
-      # job is a mirror of the one that follows, differs in explcit branch naming
-      # Certification (Radisys 1600G) pod with olt/onu - master versions timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-1'
-          config-pod: 'menlo-certification-pod-radisys-1600g'
-          disable-job: true       # menlo-certification-pod-1: offline
-          reinstall-olt: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '21'
-          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
-
-          # branches moved, master.yaml jobs retained here for now
-          # Certification (Radisys 1600G) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          timeout: 330
-          build-node: 'menlo-certification-pod-1'
-          config-pod: 'menlo-certification-pod-radisys-1600g'
-          disable-job: true       # menlo-certification-pod-1: offline
-          release: 'master'
-          branch: 'master'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
-
-      # Certification (Radisys 1600X) pod with olt/onu - master versions 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
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '1'
-          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
-
-      # Certification (Radisys 1600X) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          timeout: 330
-          build-node: 'menlo-certification-pod-2'
-          config-pod: 'menlo-certification-pod-radisys-1600x'
-          disable-job: true
-          release: 'master'
-          branch: 'master'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/master/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: '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'
-          disable-job: true
-          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-2'
-          config-pod: 'menlo-certification-pod-radisys-1600x'
-          disable-job: true
-          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-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-certification/README b/jjb/voltha-test/voltha-certification/README
deleted file mode 100644
index 8b57f6f..0000000
--- a/jjb/voltha-test/voltha-certification/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory is used for refactoring and breakup of the kitchen sink
-JJB job yaml template that contains all versioned VOLTHA test stuies.
-
-git branches are not used, all jobs are visible.
-To support modular branch based testing naming conventions that include
-some form of voltha-X.YY will be used within configs and templates to
-support separation of jobs by release branch.
\ No newline at end of file
diff --git a/jjb/voltha-test/voltha-certification/master.yaml b/jjb/voltha-test/voltha-certification/master.yaml
deleted file mode 100644
index 9aa344f..0000000
--- a/jjb/voltha-test/voltha-certification/master.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-
-- project:
-    name: voltha-certification-jobs-master
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: 1
-    num-of-onos: 1
-    num-of-atomix: 1
-    num-of-kafka: 1
-    num-of-etcd: 1
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-
-      # -----------------------------------------------------------------------
-      # Certification (Radisys) POD test job
-      # md5sum(master): e8cb3eba849b788944cee1fe58e4091b
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          timeout: 330
-          disable-job: true      # menlo-certification-pod-3 is offline
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          release: 'master'
-          branch: 'master'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          power-switch: true
-          pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
-
-      # -----------------------------------------------------------------------
-      # Certification (Radisys) pod with olt/onu - master versions timer based job
-      # md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: true              # Reason: menlo-certification-pod-3 is offline
-          release: 'master'
-          branch: 'master'
-          reinstall-olt: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '1'
-          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-certification/playground.yaml b/jjb/voltha-test/voltha-certification/playground.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-test/voltha-certification/playground.yaml
+++ /dev/null
diff --git a/jjb/voltha-test/voltha-certification/voltha-2.11.yaml b/jjb/voltha-test/voltha-certification/voltha-2.11.yaml
deleted file mode 100644
index 03ce24f..0000000
--- a/jjb/voltha-test/voltha-certification/voltha-2.11.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-
-- project:
-    name: voltha-certification-jobs-2.11
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: 1
-    num-of-onos: 1
-    num-of-atomix: 1
-    num-of-kafka: 1
-    num-of-etcd: 1
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-
-      # -----------------------------------------------------------------------
-      # 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: true       # menlo-certification-pod-1: offline
-          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'
-
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-1'
-          config-pod: 'menlo-certification-pod-radisys-1600g'
-          disable-job: true       # menlo-certification-pod-1: offline
-          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 test job
-      # md5sum(master): e8cb3eba849b788944cee1fe58e4091b
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          timeout: 330
-          disable-job: true      # menlo-certification-pod-3 is offline
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          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 with olt/onu - 2.11 version timer based job
-      # Duplicate(?) of -- md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
-#      - 'build_voltha_pod_release_timer':
-#          build-node: 'menlo-certification-pod-3'
-#          config-pod: 'menlo-certification-pod-radisys-3200g'
-#          disable-job: true       # menlo-certification-pod-3: offline
-#          reinstall-olt: true
-#          release: '2.11'
-#          branch: 'voltha-2.11'
-#          name-extension: '_DT'
-#          work-flow: 'DT'
-#          profile: '1T8GEM'
-#          time: '9'
-#          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-#          extraHelmFlags: "--set onos-classic.image.tag=master"
-
-      # -----------------------------------------------------------------------
-      # Certification (Radisys) pod with olt/onu - master versions timer based job
-      # md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: true              # Reason: menlo-certification-pod-3 is offline
-          release: '2.11'
-          branch: 'voltha-2.11'
-          reinstall-olt: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '1'
-          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-certification/voltha-2.12.yaml b/jjb/voltha-test/voltha-certification/voltha-2.12.yaml
deleted file mode 100644
index b750532..0000000
--- a/jjb/voltha-test/voltha-certification/voltha-2.12.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-
-- project:
-    name: voltha-certification-jobs-2.12
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: 1
-    num-of-onos: 1
-    num-of-atomix: 1
-    num-of-kafka: 1
-    num-of-etcd: 1
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-
-      # -----------------------------------------------------------------------
-      # 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: true       # menlo-certification-pod-1: offline
-          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'
-      
-      # -----------------------------------------------------------------------
-      # 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: true      # menlo-certification-pod-1: offline
-          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"
-
-      # -----------------------------------------------------------------------
-      # Certification (Radisys) POD test job
-      # md5sum(master): e8cb3eba849b788944cee1fe58e4091b
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          timeout: 330
-          disable-job: true      # menlo-certification-pod-3 is offline
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          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'
-
-      # Certification (Radisys) pod with olt/onu - 2.12 version timer based job
-      # Duplicate(?) of -- md5sum(master): 2ea4de8fab54538915bcf95ab08c8430
-#      - 'build_voltha_pod_release_timer':
-#          build-node: 'menlo-certification-pod-3'
-#          config-pod: 'menlo-certification-pod-radisys-3200g'
-#          disable-job: true
-#          reinstall-olt: true
-#          release: '2.12'
-#          branch: 'voltha-2.12'
-#          name-extension: '_DT'
-#          work-flow: 'DT'
-#          profile: '1T8GEM'
-#          time: '9'
-#          pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
-#          extraHelmFlags: "--set onos-classic.image.tag=master"
-          
-      # -----------------------------------------------------------------------
-      # Certification (Radisys) pod with olt/onu - master versions timer based job
-      # md5sum(master): 2ea4de8fab54538915bcf95ab08c8430 
-     # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job: true              # Reason: menlo-certification-pod-3 is offline
-          release: '2.12'
-          branch: 'voltha-2.12'
-          reinstall-olt: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '1'
-          extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-certification/voltha-2.8.yaml b/jjb/voltha-test/voltha-certification/voltha-2.8.yaml
deleted file mode 100644
index 08cca79..0000000
--- a/jjb/voltha-test/voltha-certification/voltha-2.8.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-
-- project:
-    name: voltha-certification-jobs-2.8
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: 1
-    num-of-onos: 1
-    num-of-atomix: 1
-    num-of-kafka: 1
-    num-of-etcd: 1
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-
-      # 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:   true       # legacy
-          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: true       # legacy
-          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-3'
-          config-pod: 'menlo-certification-pod-radisys-3200g'
-          disable-job:   true       # legacy
-          reinstall-olt: true
-          release: '2.8'
-          branch: 'voltha-2.8'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          time: '9'
-          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: true       # legacy
-          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-nightly-jobs/README b/jjb/voltha-test/voltha-nightly-jobs/README
deleted file mode 100644
index 8b57f6f..0000000
--- a/jjb/voltha-test/voltha-nightly-jobs/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory is used for refactoring and breakup of the kitchen sink
-JJB job yaml template that contains all versioned VOLTHA test stuies.
-
-git branches are not used, all jobs are visible.
-To support modular branch based testing naming conventions that include
-some form of voltha-X.YY will be used within configs and templates to
-support separation of jobs by release branch.
\ No newline at end of file
diff --git a/jjb/voltha-test/voltha-nightly-jobs/master.yaml b/jjb/voltha-test/voltha-nightly-jobs/master.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-test/voltha-nightly-jobs/master.yaml
+++ /dev/null
diff --git a/jjb/voltha-test/voltha-nightly-jobs/playground.yaml b/jjb/voltha-test/voltha-nightly-jobs/playground.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-test/voltha-nightly-jobs/playground.yaml
+++ /dev/null
diff --git a/jjb/voltha-test/voltha-nightly-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-nightly-jobs/voltha-2.11.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-test/voltha-nightly-jobs/voltha-2.11.yaml
+++ /dev/null
diff --git a/jjb/voltha-test/voltha-nightly-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-nightly-jobs/voltha-2.12.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-test/voltha-nightly-jobs/voltha-2.12.yaml
+++ /dev/null
diff --git a/jjb/voltha-test/voltha-nightly-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-nightly-jobs/voltha-2.8.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-test/voltha-nightly-jobs/voltha-2.8.yaml
+++ /dev/null
diff --git a/jjb/voltha-test/voltha-pod-jobs/master.yaml b/jjb/voltha-test/voltha-pod-jobs/master.yaml
deleted file mode 100644
index c56ee30..0000000
--- a/jjb/voltha-test/voltha-pod-jobs/master.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-pod-jobs-master
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - uses tech profile on voltha branch
-      # md5sum(master): 9293b0f6d3c00a28c8d1a65ef0e8826e
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true                    # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: 'master'
-          branch: 'master'
-          power-switch: true
-          power-cycle-olt: true
-          test-repo: 'voltha-system-tests'
-          profile: 'Default'
-
-      # -----------------------------------------------------------------------
-      # Menlo pod test job - uses tech profile on voltha branch
-      # md5sum(master): 139b227f6ebe777a7337a07d9883a57f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          timeout: 330
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true                      # Reason: menlo-demo-pod offline
-          release: 'master'
-          branch: 'master'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
-          power-switch: true
-          power-cycle-olt: true
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - released versions: uses tech profile on voltha branch
-      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true                     # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: 'master'
-          branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          power-cycle-olt: true
-          pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-          timeout: 360
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - using voltha branch
-      # md5sum(master): fbe8e6efaa4f3aba576040ac521a8d6f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_manual_test':
-          disable-job: true                # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          profile: 'TP'
-          branch: 'master'
-          release: 'master'
-          work-flow: 'TT'
-          name-extension: '_TT'
-          test-type: ''
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-pod-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-pod-jobs/voltha-2.11.yaml
deleted file mode 100644
index ff90b89..0000000
--- a/jjb/voltha-test/voltha-pod-jobs/voltha-2.11.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-pod-jobs-2.11
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      # -----------------------------------------------------------------------
-      # [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.11'
-          branch: 'voltha-2.11'
-          power-switch: true
-          test-repo: 'voltha-system-tests'
-          profile: '1T4GEM'
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - uses tech profile on voltha branch
-      # md5sum(master): 9293b0f6d3c00a28c8d1a65ef0e8826e
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true                    # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          power-switch: true
-          power-cycle-olt: true
-          test-repo: 'voltha-system-tests'
-          profile: 'Default'
-
-      # -----------------------------------------------------------------------
-      # Menlo pod test job - uses tech profile on voltha branch
-      # md5sum(master): 139b227f6ebe777a7337a07d9883a57f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          timeout: 300
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true                      # Reason: menlo-demo-pod offline
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          test-repo: 'voltha-system-tests'
-          profile: '1T8GEM'
-          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
-          power-switch: true
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - released versions: uses tech profile on voltha branch 
-      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test': 
-          disable-job: true                     # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          pipeline-script: 'voltha/voltha-2.11/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - using voltha branch
-      # md5sum(master): fbe8e6efaa4f3aba576040ac521a8d6f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_manual_test':
-          disable-job: true                # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          profile: 'TP'
-          branch: 'voltha-2.11'
-          release: '2.11'
-          work-flow: 'TT'
-          name-extension: '_TT'
-          test-type: ''
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.11/voltha-tt-physical-functional-tests.groovy'
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-pod-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-pod-jobs/voltha-2.12.yaml
deleted file mode 100644
index 70ad6e2..0000000
--- a/jjb/voltha-test/voltha-pod-jobs/voltha-2.12.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-pod-jobs-2.12
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      # -----------------------------------------------------------------------
-      # [VOL-4939] - flex pod1 test job - released versions: uses tech profile on voltha branch
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true              # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          power-switch: true
-          test-repo: 'voltha-system-tests'
-          profile: '1T4GEM'
-
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - uses tech profile on voltha branch
-      # md5sum(master): 9293b0f6d3c00a28c8d1a65ef0e8826e
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true                    # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: 'voltha-2.12'
-          branch: '2.12'
-          power-switch: true
-          power-cycle-olt: true
-          test-repo: 'voltha-system-tests'
-          profile: 'Default'
-
-      # -----------------------------------------------------------------------
-      # Menlo pod test job - uses tech profile on voltha branch
-      # md5sum(master): 139b227f6ebe777a7337a07d9883a57f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          timeout: 300
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true                      # Reason: menlo-demo-pod offline
-          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
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - released versions: uses tech profile on voltha branch 
-      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true                     # Reason: qa-testvm-pod offline
-          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'
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - using voltha branch
-      # md5sum(master): fbe8e6efaa4f3aba576040ac521a8d6f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_manual_test':
-          disable-job: true                # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          profile: 'TP'
-          branch: 'voltha-2.12'
-          release: '2.12'
-          work-flow: 'TT'
-          name-extension: '_TT'
-          test-type: ''
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.12/voltha-tt-physical-functional-tests.groovy'
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-pod-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-pod-jobs/voltha-2.8.yaml
deleted file mode 100644
index 3765c9c..0000000
--- a/jjb/voltha-test/voltha-pod-jobs/voltha-2.8.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-pod-jobs-2.8
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-
-      # -----------------------------------------------------------------------
-      # Menlo pod test job - uses tech profile on voltha branch
-      # md5sum(master): 139b227f6ebe777a7337a07d9883a57f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          timeout: 330
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true                      # Reason: menlo-demo-pod offline
-          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
-          power-cycle-olt: true
-
-      # -----------------------------------------------------------------------
-      # flex pod1 test job - released versions: uses tech profile on voltha branch 
-      # md5sum(master): a616cd61a22b0acde95efb1c71b4b980
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_test':
-          disable-job: true                     # Reason: qa-testvm-pod offline
-          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'
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/README b/jjb/voltha-test/voltha-release-jobs/README
deleted file mode 100644
index 8b57f6f..0000000
--- a/jjb/voltha-test/voltha-release-jobs/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory is used for refactoring and breakup of the kitchen sink
-JJB job yaml template that contains all versioned VOLTHA test stuies.
-
-git branches are not used, all jobs are visible.
-To support modular branch based testing naming conventions that include
-some form of voltha-X.YY will be used within configs and templates to
-support separation of jobs by release branch.
\ No newline at end of file
diff --git a/jjb/voltha-test/voltha-release-jobs/master.yaml b/jjb/voltha-test/voltha-release-jobs/master.yaml
deleted file mode 100644
index 67908c0..0000000
--- a/jjb/voltha-test/voltha-release-jobs/master.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# NOTE: Remove -master after ci-management/jjb/voltha-test/voltha.yaml
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-release-jobs-master
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      # flex OCP pod with olt/onu - Default tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
-          disable-job: true              # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          profile: 'Default'
-          time: '5'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-
-      # [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'
-          branch: 'master'
-          release: 'master' 
-          profile: '1T4GEM'
-          time: '1'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          pipeline-script: 'voltha/master/physical-build.groovy'
- 
-      # -----------------------------------------------------------------------
-      # Menlo pod with olt/onu - master branch,  Default tech profile and timer based job
-      # md5sum(master): f94fd1f2d15674629cb0900bb3b6c08a
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          #branch: 'master'
-          #release: 'master'
-          disable-job: true              # menlo-demo-pod offline
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T8GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          VolthaEtcdPort: 9999
-          in-band-management: true
-          waitTimerForOltUp: 540
-          time: '6'
-# Was not mentioned in voltha.yaml for branch=master ?!?
-#          pipeline-script: 'voltha/master/physical-build.groovy'
-
-      # -----------------------------------------------------------------------
-      # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
-      # md5sum(master): 68a2922b69b3b7f83a599ae6fb7abb1c
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true               # Reason: onf-demo-pod offline
-          release: 'master'
-          branch: 'master'
-          profile: '1T4GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          in-band-management: true
-          waitTimerForOltUp: 540
-          VolthaEtcdPort: 9999
-          time: '1'
-
-      # -----------------------------------------------------------------------
-      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      # md5sum(master): 07b501ef13e00b5aeaf808ca534ba276
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          disable-job: true              # Reason: qa-test-vm offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: 'master'
-          branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '10'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-
-      # -----------------------------------------------------------------------
-      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      # ec22ad3751cbb83e0cff505eaebe9f6f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord-multi-uni'
-          release: 'master'
-          branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '16'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          reinstall-olt: true
-          enableMultiUni: true
-          uniPortMask: '0x0003'
-          
-# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/playground.yaml b/jjb/voltha-test/voltha-release-jobs/playground.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-test/voltha-release-jobs/playground.yaml
+++ /dev/null
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
deleted file mode 100644
index fecba63..0000000
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-release-jobs-2.11
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      # flex OCP pod with olt/onu - 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.11'
-          branch: 'voltha-2.11'
-          profile: 'Default'
-          time: '5'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-      
-      # [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'
-
-      # -----------------------------------------------------------------------
-      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      # md5sum(master): 07b501ef13e00b5aeaf808ca534ba276
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          disable-job: true               # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          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.11/physical-build.groovy'
-
-      # ----------------------------------------------------------------------- 
-      # Menlo pod with olt/onu - released branch,  Default tech profile and timer based job
-      # md5sum(master): f94fd1f2d15674629cb0900bb3b6c08a
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true              # menlo-demo-pod offline
-          release: '2.11'
-          branch: 'voltha-2.11'
-          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.11/physical-build.groovy'
-
-      # -----------------------------------------------------------------------
-      # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
-      # md5sum(master): 68a2922b69b3b7f83a599ae6fb7abb1c
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true               # Reason: onf-demo-pod offline
-          release: '2.11'
-          branch: 'voltha-2.11'
-          profile: '1T4GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          in-band-management: true
-          waitTimerForOltUp: 540
-          VolthaEtcdPort: 9999
-          time: '1'
-
-      # -----------------------------------------------------------------------
-      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      # ec22ad3751cbb83e0cff505eaebe9f6f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord-multi-uni'
-          release: '2.11'
-          branch: 'voltha-2.11'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '16'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          reinstall-olt: true
-          enableMultiUni: true
-          uniPortMask: '0x0003'
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
deleted file mode 100644
index e659ac6..0000000
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-release-jobs-2.12
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      # -----------------------------------------------------------------------
-      # flex OCP pod with olt/onu - 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.12'
-          branch: 'voltha-2.12'
-          profile: 'Default'
-          time: '5'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
- 
-      # -----------------------------------------------------------------------
-      # [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.12'
-          branch: 'voltha-2.12'
-          profile: '1T4GEM'
-          time: '1'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          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
-      # md5sum(master): 07b501ef13e00b5aeaf808ca534ba276
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          disable-job: true                   # Reason: qa-testvm-pod offline
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          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.12/physical-build.groovy'
-
-      # ----------------------------------------------------------------------- 
-      # Menlo pod with olt/onu - released branch,  Default tech profile and timer based job
-      # md5sum(master): f94fd1f2d15674629cb0900bb3b6c08a
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true               # menlo-demo-pod offline
-          release: '2.12'
-          branch: 'voltha-2.12'
-          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.12/physical-build.groovy'
-
-      # -----------------------------------------------------------------------
-      # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
-      # md5sum(master): 68a2922b69b3b7f83a599ae6fb7abb1c
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-demo-pod'
-          config-pod: 'onf-demo-pod'
-          disable-job: true               # Reason: onf-demo-pod offline
-          release: '2.12'
-          branch: 'voltha-2.12'
-          profile: '1T4GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          in-band-management: true
-          waitTimerForOltUp: 540
-          VolthaEtcdPort: 9999
-          time: '1'
-
-      # -----------------------------------------------------------------------
-      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      # ec22ad3751cbb83e0cff505eaebe9f6f
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord-multi-uni'
-          release: '2.12'
-          branch: 'voltha-2.12'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '16'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          reinstall-olt: true
-          enableMultiUni: true
-          uniPortMask: '0x0003'
-          
-# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
deleted file mode 100644
index 39e5308..0000000
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-release-jobs-2.8
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      # flex OCP pod with olt/onu - 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'
-          profile: 'Default'
-          time: '5'
-          VolthaEtcdPort: 9999
-          num-of-onos: '3'
-          num-of-atomix: '3'
-
-      # [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 OCP pod with olt/onu - Released versions Default tech profile and timer based job
-      # -----------------------------------------------------------------------
-      - 'build_voltha_pod_release_timer':
-          disable-job: true               # Reason: qa-testvm-pod offline
-          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'
-
-      # -----------------------------------------------------------------------
-      # 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'
-          
-# [EOF]
diff --git a/jjb/voltha-test/voltha-soak-jobs/master.yaml b/jjb/voltha-test/voltha-soak-jobs/master.yaml
deleted file mode 100644
index 056284e..0000000
--- a/jjb/voltha-test/voltha-soak-jobs/master.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-soak-jobs-master
-#   (was)   name: voltha-release-jobs
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-# Can we assign this once in the template header ?
-#          branch: 'master'
-#          release: 'master'
-
-    jobs:
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD build job
-      # md5sum(master): ac5414a6fa137ae7e80d400a4d764495
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_manual':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod' 
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          branch: 'master'
-          release: 'master'
-          bbsimReplicas: 1
-          profile: '1T8GEM'
-          name-extension: '_DT'
-          work-flow: 'DT'
-          reinstall-olt: true
-          num-of-onus: 32
-          num-of-ponports: 16
-          logLevel: 'WARN'
-
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD test job
-      # Run dataplane tests every Saturday
-      # md5sum(master): ef45e5436813c9bf3d4d16cc0bd8a445
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_soak_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          profile: '1T8GEM'
-          branch: 'master'
-          release: 'master'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_DP'
-          test-type: 'Dataplane'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/master/voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H * * 6"
-
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD test job
-      # Run failure/recovery tests every Wednesday
-      # md5sum(master): 6b9d51edecf561f79e0187c837493463
-      # -----------------------------------------------------------------------      
-      - 'build_voltha_pod_soak_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          profile: '1T8GEM'
-          branch: 'master'
-          release: 'master'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_Fail'
-          test-type: 'Failure'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/master/voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H * * 3"
-
-      # -----------------------------------------------------------------------      
-      # ONF Menlo Soak POD test job
-      # Run tests manually triggering the job
-      # md5sum(master): a71054dd64ac725e723515e70af74555
-      # -----------------------------------------------------------------------       
-      - 'build_voltha_pod_manual_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          profile: '1T8GEM'
-          branch: 'master'
-          release: 'master'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_Func'
-          test-type: 'Functional'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/master/voltha-physical-soak-dt-tests.groovy'
-
-# [EOF]
diff --git a/jjb/voltha-test/voltha-soak-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-soak-jobs/voltha-2.11.yaml
deleted file mode 100644
index f901a19..0000000
--- a/jjb/voltha-test/voltha-soak-jobs/voltha-2.11.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-soak-jobs-2.11
-#   (was)   name: voltha-release-jobs
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-# Can we assign this once in the template header ?
-#          branch: 'voltha-2.11'
-#          release: '2.11'
-
-    jobs:
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD build job - voltha-master 
-      # md5sum(master): ac5414a6fa137ae7e80d400a4d764495
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_manual':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          branch: 'voltha-2.11'
-          release: '2.11'
-          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.11/physical-build.groovy'
-
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD test job
-      # Run dataplane tests every Saturday
-      # md5sum(master): ef45e5436813c9bf3d4d16cc0bd8a445
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_soak_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          profile: '1T8GEM'
-          branch: 'voltha-2.11'
-          release: '2.11'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_DP'
-          test-type: 'Dataplane'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/master/voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H * * 6"
-
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD test job
-      # Run failure/recovery tests every Wednesday
-      # md5sum(master): 6b9d51edecf561f79e0187c837493463
-      # -----------------------------------------------------------------------      
-      - 'build_voltha_pod_soak_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          profile: '1T8GEM'
-          branch: 'voltha-2.11'
-          release: '2.11'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_Fail'
-          test-type: 'Failure'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H * * 3"
-
-      # -----------------------------------------------------------------------      
-      # ONF Menlo Soak POD test job
-      # Run tests manually triggering the job
-      # md5sum(master): a71054dd64ac725e723515e70af74555
-      # -----------------------------------------------------------------------       
-      - 'build_voltha_pod_manual_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          profile: '1T8GEM'
-          branch: 'voltha-2.11'
-          release: '2.11'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_Func'
-          test-type: 'Functional'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
-          
-# [EOF]
diff --git a/jjb/voltha-test/voltha-soak-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-soak-jobs/voltha-2.12.yaml
deleted file mode 100644
index 58f73ff..0000000
--- a/jjb/voltha-test/voltha-soak-jobs/voltha-2.12.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-soak-jobs-2.12
-#   (was)   name: voltha-release-jobs
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-# Can we assign this once in the template header ?
-#          branch: 'voltha-2.12'
-#          release: '2.12'
-
-    jobs:
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD build job - voltha-master branch
-      # md5sum(master): ac5414a6fa137ae7e80d400a4d764495
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_manual':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          branch: 'voltha-2.12'
-          release: '2.12'
-          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.12/physical-build.groovy'
-
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD test job
-      # Run failure/recovery tests every Wednesday
-      # md5sum(master): 6b9d51edecf561f79e0187c837493463
-      # -----------------------------------------------------------------------      
-      - 'build_voltha_pod_soak_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          profile: '1T8GEM'
-          branch: 'voltha-2.12'
-          release: '2.12'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_Fail'
-          test-type: 'Failure'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.12/voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H * * 3"
-
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD test job
-      # Run dataplane tests every Saturday
-      # md5sum(master): ef45e5436813c9bf3d4d16cc0bd8a445
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_soak_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline 
-          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"
-
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD test job
-      # Run failure/recovery tests every Wednesday
-      # md5sum(master): 6b9d51edecf561f79e0187c837493463
-      # -----------------------------------------------------------------------      
-      - 'build_voltha_pod_manual_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline 
-          profile: '1T8GEM'
-          branch: 'voltha-2.12'
-          release: '2.12'
-          work-flow: 'DT'
-          name-extension: '_DT_soak_Func'
-          test-type: 'Functional'
-          test-repo: 'voltha-system-tests'
-          pipeline-script: 'voltha/voltha-2.12/voltha-physical-soak-dt-tests.groovy'
-# [EOF]
diff --git a/jjb/voltha-test/voltha-soak-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-soak-jobs/voltha-2.8.yaml
deleted file mode 100644
index 8ebb87c..0000000
--- a/jjb/voltha-test/voltha-soak-jobs/voltha-2.8.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-# POD Build Pipeline Jobs for Voltha Releases
-# -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-- project:
-    name: voltha-soak-jobs-2.8
-#   (was)   name: voltha-release-jobs
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    with-kind: false
-    power-switch: false
-    power-cycle-olt: false
-    work-flow: 'ATT'
-    in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    reinstall-olt: true
-    test-type: ''
-    volthaSystemTestsChange: ''
-    kindVolthaChange: ''
-    cordTesterChange: ''
-    oltAdapterAppLabel: 'adapter-open-olt'
-    num-of-onus: ''
-    num-of-ponports: ''
-
-# Can we assign this once in the template header ?
-#          branch: 'voltha-2.8'
-#          release: '2.8'
-
-    jobs:
-      # -----------------------------------------------------------------------
-      # ONF Menlo Soak POD build job
-      # md5sum(master): ac5414a6fa137ae7e80d400a4d764495
-      # ----------------------------------------------------------------------- 
-      - 'build_voltha_pod_manual':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          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 test job
-      # Run failure/recovery tests every Wednesday
-      # md5sum(master): 6b9d51edecf561f79e0187c837493463
-      # -----------------------------------------------------------------------      
-      - 'build_voltha_pod_soak_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          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
-      # Run dataplane tests every Saturday
-      # md5sum(master): ef45e5436813c9bf3d4d16cc0bd8a445
-      # -----------------------------------------------------------------------
-      - '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
-      # Run tests manually triggering the job
-      # md5sum(master): a71054dd64ac725e723515e70af74555
-      # -----------------------------------------------------------------------       
-      - 'build_voltha_pod_manual_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod'
-          disable-job: true                # Reason: menlo-soak-pod is offline
-          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'
-          
-# [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 43dd60c..5a4b13b 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -1,8 +1,6 @@
 ---
 # POD Build Pipeline Jobs for Voltha Releases
 # -----------------------------------------------------------------------
-# Disabled, offline -- 'qa-testvm-pod'
-# -----------------------------------------------------------------------
 - project:
     name: voltha-release-jobs
 
@@ -28,35 +26,6 @@
     num-of-ponports: ''
 
     jobs:
-      # flex OCP pod with olt/onu - manual test job, voltha master build job
-      - 'build_voltha_pod_manual':
-          disable-job: false
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          num-of-kafka: '3'
-          num-of-etcd: '3'
-          VolthaEtcdPort: 9999
-          profile: 'TP'
-          name-extension: '_TT'
-          work-flow: 'TT'
-
-      - 'build_voltha_pod_test':
-          disable-job: true
-          build-node: 'qa-testvm-pod'
-          config-pod: 'flex-ocp-cord-multi-uni'
-          release: 'master'
-          branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          power-cycle-olt: true
-          pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-          enableMultiUni: true
-
       # -----------------------------------------------------------------------
       # Berlin pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
@@ -115,21 +84,6 @@
           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'
-
-      # 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'
@@ -159,21 +113,6 @@
           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':
           build-node: 'berlin-community-pod-1'
@@ -203,21 +142,6 @@
           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':
           build-node: 'berlin-community-pod-1'
@@ -249,20 +173,6 @@
           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':
           build-node: 'berlin-community-pod-1'
@@ -385,8 +295,8 @@
           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
+
+      # 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'
           config-pod: 'berlin-community-pod-2-gpon-zyxel'
@@ -608,27 +518,6 @@
           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_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':
           build-node: 'berlin-community-pod-1'
@@ -672,22 +561,6 @@
           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':
           timeout: 390