Remove out of date jobs

As discussed with the TST, many views and jobs were out of date.
The deleted jobs and files here represent those that have not run in
over a year, or have never run, with a few exceptions (2.11 and 2.13
jobs, scale tests).

Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I52697c6f927059685b6c502dfc5a945a3290d31a
diff --git a/jjb/build_openolt_deb.yaml b/jjb/build_openolt_deb.yaml
deleted file mode 100644
index d03664c..0000000
--- a/jjb/build_openolt_deb.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-# build_openolt_deb
-
-- project:
-    name: build_openolt_deb
-
-    project-name: '{name}'
-
-    jobs:
-      - 'build_openolt_deb'
-
-- job-template:
-    id: build_openolt_deb
-    name: 'build_openolt_deb'
-    disabled: true
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/{name}
-
-    triggers:
-      - cord-infra-gerrit-trigger-merge:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^(openolt)$'
-          branch-regexp: '{modern-branches-regexp}'
-          file-include-regexp: '{all-files-regexp}'
-          dependency-jobs: '{dependency-jobs}'
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    node: 'qct-pod3-node2'
-
-    project-type: pipeline
-    concurrent: true
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-build'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/openolt'
-            branches:
-              - 'master'
-
-# [EOF]
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
deleted file mode 100644
index 27047a4..0000000
--- a/jjb/cord-test/att-workflow.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
----
-# POD Build Pipeline Jobs for ATT-WorkflowDriver
-# -----------------------------------------------------------------------
-# Disabled offline -- build-node: 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-
-- project:
-    name: attworkflowdriver-build-job
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    work-flow: ''
-    num-of-openonu: '1'
-    num-of-onos: '1'
-    num-of-atomix: '0'
-    in-band-management: false
-    reinstall-olt: true
-    num-of-onus: ''
-    num-of-ponports: ''
-
-    jobs:
-      # onlab pod1 build
-      - 'build_pod_manual':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod1'
-          profile: 'att-workflow'
-          branch: 'master'
-          test-repo: 'cord-tester'
-          helmRepoUrl: 'https://charts.opencord.org'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-          oltDebVersion: 'openolt-master.deb'
-
-      # onlab pod1 build - cord6.1(voltha 1.6) - seba1.0
-      - 'build_pod_manual':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod1-voltha16'
-          profile: 'att-workflow'
-          branch: 'cord-6.1'
-          test-repo: 'cord-tester'
-          helmRepoUrl: 'https://charts.opencord.org'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-          oltDebVersion: 'openolt-master-voltha16.deb'
-
-      # flex pod1 test job - using voltha-master branch
-      - 'build_pod_test':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod1-qa'
-          profile: 'att-workflow'
-          branch: 'master'
-          test-repo: 'cord-tester'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
-      # onlab pod2 build
-      - 'build_pod_manual':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod2'
-          profile: 'att-workflow'
-          branch: 'master'
-          test-repo: 'cord-tester'
-          helmRepoUrl: 'https://charts.opencord.org'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-          oltDebVersion: 'openolt-master.deb'
-
-      # flex OCP pod with olt/onu : using voltha latest(master)
-      # - 'build_pod_timer':
-      #   build-node: 'qa-testvm-pod'
-      #   config-pod: 'flex-ocp-cord-voltha-master'
-      #   profile: 'att-workflow'
-      #   branch: 'master'
-      #   test-repo: 'cord-tester'
-      #   helmRepoUrl: 'https://charts.opencord.org'
-      #   Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-      #   oltDebVersion: 'openolt-master.deb'
-      #   time: '6'
-
-      # flex OCP pod with olt/onu - seba-1.0/cord-6.1 release
-      # - 'build_pod_timer':
-      #   build-node: 'qa-testvm-pod'
-      #   config-pod: 'flex-ocp-cord-voltha16'
-      #   profile: 'att-workflow'
-      #   branch: 'cord-6.1'
-      #   test-repo: 'cord-tester'
-      #   Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-      #   oltDebVersion: 'openolt-master-voltha16.deb'
-      #   configurePod: true
-      #   time: '3'
-
-      # flex OCP test job - using voltha-master branch
-      # - 'build_pod_test':
-      #    build-node: 'qa-testvm-pod'
-      #    config-pod: 'flex-ocp-cord-voltha-master'
-      #    profile: 'att-workflow'
-      #    branch: 'master'
-      #    test-repo: 'cord-tester'
-      #    Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
-      # flex ocp pod test job - seba-1.0/cord-6.1 release
-      # - 'build_pod_test':
-      #    build-node: 'qa-testvm-pod'
-      #    config-pod: 'flex-ocp-cord-voltha16'
-      #    profile: 'att-workflow'
-      #    branch: 'cord-6.1'
-      #    test-repo: 'cord-tester'
-      #    Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
-# [EOF]
diff --git a/jjb/cord-test/mcord.yaml b/jjb/cord-test/mcord.yaml
deleted file mode 100644
index 5501e6f..0000000
--- a/jjb/cord-test/mcord.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# POD Build Pipeline Jobs for MCORD
-
-- project:
-    name: mcord-build-job
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    jobs:
-      # onlab mcord-pod1 build
-      - 'build_mcord_pod_manual':
-          build-node: 'onf-build'
-          config-pod: 'onf-mcord-pod1'
-          profile: 'mcord'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile-mcord-local-build'
-
-      - 'build_mcord_pod_manual':
-          build-node: 'onf-build'
-          config-pod: 'onf-mcord-pod2'
-          profile: 'mcord'
-          branch: 'master'
-          configurePod: false
-          Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
-
-      - 'build_mcord_pod_manual':
-          build-node: 'mcord-dt'
-          config-pod: 'mcord-barcellona-remote-dt'
-          profile: 'mcord'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
-
-# [EOF]
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
deleted file mode 100644
index 45d3407..0000000
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ /dev/null
@@ -1,790 +0,0 @@
----
-# POD Nightly Build Pipeline Jobs
-
-- _test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
-    name: test-pipe-job-boiler-plate
-
-    project-type: pipeline
-
-    sandbox: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{big-build-days-to-keep}'
-          artifact-num-to-keep: '{big-artifact-num-to-keep}'
-
-
-- job-template:
-    name: 'build_{profile}{name-extension}_{config-pod}_{branch}_manual'
-    id: build_pod_manual
-    description: |
-                  Manual Build on POD {config-pod} using {Jenkinsfile}<br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
-                  Copyright 2018-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    openoltAdapterChart: onf/voltha-adapter-openolt
-
-    oltAdapterReleaseName: open-olt
-
-    waitTimerForOltUp: 360
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - string:
-          name: helmRepoUrl
-          default: 'https://charts.opencord.org'
-          description: 'URL where helm-charts are published'
-
-      - string:
-          name: profile
-          default: '{profile}'
-          description: 'Profile in which this job installs'
-
-      - bool:
-          name: installMonitoringAndLogging
-          default: false
-          description: "Wether to install prometheus and Elk-stack"
-
-      - bool:
-          name: configurePod
-          default: true
-          description: "Configure POD via TOSCA post build"
-
-      - bool:
-          name: reinstallOlt
-          default: '{reinstall-olt}'
-          description: "Re-install olt software bringing up CORD"
-
-      - bool:
-          name: installBBSim
-          default: false
-          description: "Install the BBSim container"
-
-      - string:
-          name: onuNumber
-          default: '{num-of-onus}'
-          description: "Onus per PonPort"
-
-      - string:
-          name: ponNumber
-          default: '{num-of-ponports}'
-          description: "Number of PON Ports"
-
-      - string:
-          name: workFlow
-          default: '{work-flow}'
-          description: 'Installs and uses the specified work flow on the POD'
-
-      - string:
-          name: NumOfOpenOnu
-          default: '{num-of-openonu}'
-          description: 'Installs the specified Number of OpenOnu Adapters'
-
-      - string:
-          name: NumOfOnos
-          default: '{num-of-onos}'
-          description: 'Installs the specified Number of ONOS instances'
-
-      - bool:
-          name: inBandManagement
-          default: '{in-band-management}'
-          description: 'Indicates whether POD is configured for in band management'
-
-      - string:
-          name: NumOfAtomix
-          default: '{num-of-atomix}'
-          description: 'Installs the specified Number of Atomix Instances'
-
-      - string:
-          name: openoltAdapterChart
-          default: '{openoltAdapterChart}'
-          description: 'Olt adapter chart name (or location on file system)'
-
-      - string:
-          name: oltAdapterReleaseName
-          default: '{oltAdapterReleaseName}'
-          description: 'Olt adapter release name'
-
-      - string:
-          name: waitTimerForOltUp
-          default: '{waitTimerForOltUp}'
-          description: 'Wait timer for the OLT to come up after reboot'
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/{test-repo}'
-            branches:
-              - '{branch}'
-
-- job-template:
-    name: 'build_{profile}_{config-pod}_{branch}'
-    id: build_pod_timer
-    description: |
-                  Nightly Kubernetes tests on {config-pod} using {Jenkinsfile}<br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml<br />
-                  Created by Suchitra Vemuri, suchitra@opennetworking.org <br />
-                  Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
-    disabled: '{disable-job}'
-
-    <<: *test-pipe-job-boiler-plate
-
-    openoltAdapterChart: onf/voltha-adapter-openolt
-
-    oltAdapterReleaseName: open-olt
-
-    waitTimerForOltUp: 360
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: oltDebVersion
-          default: '{oltDebVersion}'
-          description: 'OLT Software version to install'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - string:
-          name: helmRepoUrl
-          default: 'https://charts.opencord.org'
-          description: 'URL where helm-charts are published'
-
-      - string:
-          name: profile
-          default: '{profile}'
-          description: 'Profile in which this job installs'
-
-      - bool:
-          name: configurePod
-          default: true
-          description: "Configure POD via TOSCA post build"
-
-      - bool:
-          name: reinstallOlt
-          default: '{reinstall-olt}'
-          description: "Re-install olt software bringing up CORD"
-
-      - bool:
-          name: installBBSim
-          default: false
-          description: "Install the BBSim container"
-
-      - string:
-          name: onuNumber
-          default: '16'
-          description: "Onus per PonPort"
-
-      - string:
-          name: openoltAdapterChart
-          default: '{openoltAdapterChart}'
-          description: 'Olt adapter chart name (or location on file system)'
-
-      - string:
-          name: oltAdapterReleaseName
-          default: '{oltAdapterReleaseName}'
-          description: 'Olt adapter release name'
-
-      - string:
-          name: waitTimerForOltUp
-          default: '{waitTimerForOltUp}'
-          description: 'Wait timer for the OLT to come up after reboot'
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/{test-repo}'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 H {time} * * *
-
-- job-template:
-    name: 'build_{profile}_{config-pod}_{branch}_test'
-    id: build_pod_test
-
-    disabled: '{disable-job}'
-    description: |
-                  Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {Jenkinsfile}<br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
-                  UUID: 9f1d0a1a-4058-11ee-93cc-07cf258f407e <br />
-                  Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/{test-repo}'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - reverse:
-          jobs: 'build_{profile}_{config-pod}_{branch}'
-          result: 'success'
-
-- job-template:
-    name: 'build_{config-pod}_seba_release_{release}'
-    id: build_pod_manual_release
-    description: |
-                  Manual Build on POD {config-pod}, using {Jenkinsfile}<br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
-                  Copyright 2018-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: oltDebVersion
-          default: '{oltDebVersion}'
-          description: 'OLT Software version to install'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - bool:
-          name: configurePod
-          default: true
-          description: "Configure POD via TOSCA post build"
-
-      - bool:
-          name: reinstallOlt
-          default: '{reinstall-olt}'
-          description: "Re-install olt software bringing up CORD"
-
-      - bool:
-          name: installBBSim
-          default: false
-          description: "Install the BBSim container"
-
-      - string:
-          name: onuNumber
-          default: '16'
-          description: "Onus per PonPort"
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord-tester'
-            branches:
-              - '{branch}'
-
-- job-template:
-    name: 'build_{config-pod}_seba_release_{release}'
-    id: build_pod_release
-    description: |
-                  Manual Build on POD {config-pod}, using {Jenkinsfile}<br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
-                  Copyright 2018-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: oltDebVersion
-          default: '{oltDebVersion}'
-          description: 'OLT Software version to install'
-
-      - string:
-          name: helmRepoUrl
-          default: 'https://charts.opencord.org'
-          description: 'URL where helm-charts are published'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - bool:
-          name: configurePod
-          default: true
-          description: "Configure POD via TOSCA post build"
-
-      - bool:
-          name: reinstallOlt
-          default: '{reinstall-olt}'
-          description: "Re-install olt software bringing up CORD"
-
-      - bool:
-          name: installBBSim
-          default: false
-          description: "Install the BBSim container"
-
-      - string:
-          name: onuNumber
-          default: '16'
-          description: "Onus per PonPort"
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord-tester'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 H {time} * * *
-
-- job-template:
-    name: 'build_{config-pod}_seba_release_{release}_test'
-    id: build_pod_release_test
-    description: |
-                  Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {Jenkinsfile} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
-                  UUID: a8bea83a-4058-11ee-a520-4f2870f29e62 <br />
-                  Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord-tester'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - reverse:
-          jobs: 'build_{config-pod}_seba_release_{release}'
-          result: 'success'
-
-
-- job-template:
-    name: 'build_{config-pod}_seba_release_{release}_microcharts_test'
-    id: build_pod_release_test_microcharts
-    description: |
-                  Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {Jenkinsfile}<br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
-                  UUID: b0d585a2-4058-11ee-8a56-a362f23eaed9 <br />
-                  Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord-tester'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - reverse:
-          jobs: 'build_{config-pod}_seba_release_{release}_microcharts'
-          result: 'success'
-
-
-- job-template:
-    name: 'build_{config-pod}'
-    id: build_mcord_pod_manual
-    description: |
-                  Manual Build on POD {config-pod}, using {Jenkinsfile} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
-                  Created by QA (Kailash Khalasi - kailash@opennetworking.org ) <br />
-                  Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: TestNodeName
-          default: '{build-node}'
-          description: 'DEPRECATED - use buildNode instead'
-
-      - string:
-          name: cordRepoUrl
-          default: '{gerrit-server-url}'
-          description: 'The URL of the CORD Project repository'
-
-      - string:
-          name: configBaseDir
-          default: 'pod-configs'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configDeploymentDir
-          default: 'deployment-configs'
-          description: 'The deployment configs folder'
-
-      - string:
-          name: configKubernetesDir
-          default: 'kubernetes-configs'
-          description: 'The kubernetes config folder'
-
-      - string:
-          name: configToscaDir
-          default: 'tosca-configs'
-          description: 'The tosca config folder'
-
-      - string:
-          name: configFileName
-          default: '{config-pod}'
-          description: 'The config file'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - string:
-          name: profile
-          default: '{profile}'
-          description: 'Profile in which this job installs'
-
-      - bool:
-          name: configurePod
-          default: true
-          description: "Configure POD via TOSCA post build"
-
-      - bool:
-          name: installEpcControlPlane
-          default: true
-          description: "Install the EPC control plane"
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord-tester'
-            branches:
-              - '{branch}'
-
-# [EOF]
diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
deleted file mode 100644
index 8f920e4..0000000
--- a/jjb/cord-test/seba-release.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
----
-# POD Build Pipeline Jobs for Seba Releases
-# -----------------------------------------------------------------------
-# Disabled offline -- build-node: 'qa-testvm-pod'
-# -----------------------------------------------------------------------
-
-- project:
-    name: seba-release-jobs
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    reinstall-olt: true
-
-    jobs:
-      # onlab pod1 build 1.0
-      - 'build_pod_manual_release':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod1-voltha16'
-          release: '1.0'
-          branch: 'cord-6.1'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-          oltDebVersion: 'openolt-master-voltha16.deb'
-
-      # onlab pod1 build 2.0
-      - 'build_pod_manual_release':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod1'
-          release: '2.0'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-          oltDebVersion: 'openolt-master.deb'
-
-      # onlab pod1 test job - release 2.0 test job
-      - 'build_pod_release_test':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod1'
-          release: '2.0'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
-      # onlab pod2 build
-      - 'build_pod_manual_release':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod2'
-          release: '1.0'
-          branch: 'cord-6.1'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-          oltDebVersion: 'openolt-master.deb'
-
-      # onlab pod2 build 2.0
-      - 'build_pod_manual_release':
-          build-node: 'onf-build'
-          config-pod: 'onlab-pod2'
-          release: '2.0'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-          oltDebVersion: 'openolt-master.deb'
-
-      # Flex POD build 2.0
-      # - 'build_pod_manual_release':
-      #    build-node: 'qa-testvm-pod'
-      #    config-pod: 'flex-ocp-cord'
-      #    release: '2.0'
-      #    branch: 'master'
-      #    Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-      #    oltDebVersion: 'openolt-master.deb'
-
-          # # flex OCP pod with olt/onu - release 2.0 build job
-          # - 'build_pod_release':
-          #     build-node: 'qa-testvm-pod'
-          #     config-pod: 'flex-ocp-cord'
-          #     release: '1.0'
-          #     branch: 'cord-6.1'
-          #     Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-          #     oltDebVersion: 'openolt-master-voltha16.deb'
-          #     time: '3'
-
-          # # flex OCP pod with olt/onu - release 2.0 build job
-          # - 'build_pod_release':
-          #     build-node: 'qa-testvm-pod'
-          #     config-pod: 'flex-ocp-cord'
-          #     release: '2.0'
-          #     branch: 'master'
-          #     Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-          #     oltDebVersion: 'openolt-master.deb'
-          #     time: '5'
-          #
-          # # flex OCP POD with olt/onu - release 1.0 test job
-          # - 'build_pod_release_test':
-          #     build-node: 'qa-testvm-pod'
-          #     config-pod: 'flex-ocp-cord'
-          #     release: '1.0'
-          #     branch: 'cord-6.1'
-          #     Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-          #
-          # # flex OCP POD with olt/onu - release 2.0 test job
-          # - 'build_pod_release_test':
-          #     build-node: 'qa-testvm-pod'
-          #     config-pod: 'flex-ocp-cord'
-          #     release: '2.0'
-          #     branch: 'master'
-          #     Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-          #
-          # # flex OCP pod with olt/onu : using voltha latest(master)
-          # - 'build_pod_release':
-          #     build-node: 'qa-testvm-pod'
-          #     config-pod: 'flex-ocp-cord'
-          #     release: '2.0-microcharts'
-          #     branch: 'master'
-          #     Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-          #     oltDebVersion: 'openolt-master.deb'
-          #     time: '7'
-          #
-          # # flex OCP test job - release 2.0 test job
-          # - 'build_pod_release_test':
-          #     build-node: 'qa-testvm-pod'
-          #     config-pod: 'flex-ocp-cord'
-          #     release: '2.0-microcharts'
-          #     branch: 'master'
-          #     Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
-# [EOF]
diff --git a/jjb/docker-publish-github.yaml b/jjb/docker-publish-github.yaml
deleted file mode 100644
index 8ea11f8..0000000
--- a/jjb/docker-publish-github.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
----
-# Github-specific docker image building + dockerhub publishing tasks
-
-- job-template:
-    id: docker-publish-github
-    name: 'docker-publish-github_{project}'
-    description: |
-      Created by {id} job-template from ci-management/jjb/docker-publish.yaml
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-          display-status: 'docker-publish'
-
-    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: gitUrl
-          default: 'https://github.com/{github-organization}/{project}'
-          description: 'URL to the git repo (on github)'
-
-      - string:
-          name: gitRef
-          default: 'master'
-          description: 'git ref to build (commit hash or tag)'
-
-      - string:
-          name: projectName
-          default: '{project}'
-          description: 'Name of the project in the Github Organization'
-
-      - string:
-          name: branchName
-          default: 'master'
-          description: 'Branch of the project - always master in the GitHub case'
-
-      - string:
-          name: dockerRepo
-          default: '{docker-repo}'
-          description: "Docker repository to push to ('opencord', 'xosproject', etc.)"
-
-      - string:
-          name: dockerRegistry
-          default: '{docker-registry}'
-          description: "Docker registry to push to (blank for DockerHub)"
-
-      # AWS CPU arch names: `x86_64` `arm64` (which don't align to vendor names... *sigh*)
-      - string:
-          name: dockerArchList
-          default: 'x86_64'
-          description: "List of architectures to build containers on, pipe separated (nonfunctional currently)"
-
-      - string:
-          name: maintainers
-          default: '{maintainers}'
-          description: "The person that sould be notified if this job fails"
-
-      - string:
-          name: extraEnvironmentVars
-          default: '{extraEnvironmentVars}'
-          description: "Provide extra environment variables to the build"
-
-    project-type: pipeline
-    concurrent: true
-    extraEnvironmentVars: ""
-
-    dsl: !include-raw-escape: pipeline/docker-publish.groovy
-
-# [EOF]
diff --git a/jjb/fossa.yaml b/jjb/fossa.yaml
deleted file mode 100644
index 9e181d5..0000000
--- a/jjb/fossa.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-# fossa license check job
-# Check for license issues with the FOSSA tool
-
-- project:
-    name: fossa-verify
-
-    jobs:
-      - 'fossa-verify':
-          fossa-team: cord
-          project-regexp: '{all-projects-regexp}'
-          branch-regexp: '{all-branches-regexp}'
-          file-include-regexp: '{all-files-regexp}'
-
-
-- job-template:
-    id: 'fossa-verify'
-    name: 'verify_fossa_{fossa-team}'
-
-    description: |
-                  Post-merge check of code with fossa toolset
-                  Created by {id} job-template from ci-management/jjb/fossa.yaml<br/>
-                  Copyright 2018-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    properties:
-      - 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: '15'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-      - credentials-binding:
-          - text:
-              credential-id: fossa-api-key
-              variable: FOSSA_API_KEY
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: gitUrl
-          default: '{gerrit-server-url}/$GERRIT_PROJECT'
-          description: 'URL to the git repo'
-
-      - string:
-          name: gitRef
-          default: '$GERRIT_PATCHSET_REVISION'
-          description: 'git ref to build (commit hash or tag)'
-
-      - string:
-          name: projectName
-          default: '$GERRIT_PROJECT'
-          description: 'Name of the project in Gerrit'
-
-      - string:
-          name: branchName
-          default: '$GERRIT_BRANCH'
-          description: 'Branch of the project in Gerrit'
-
-      - string:
-          name: fossaTeam
-          default: '{fossa-team}'
-          description: 'Team to assign this project to in FOSSA'
-
-    project-type: pipeline
-    concurrent: true
-
-    dsl: !include-raw-escape: pipeline/fossa-verify.groovy
-
-# [EOF]
diff --git a/jjb/k8install.yaml b/jjb/k8install.yaml
deleted file mode 100644
index 0088e2c..0000000
--- a/jjb/k8install.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-# kubespray installation validation job
-
-- project:
-    name: kubespray-install-test
-
-    project-name: '{name}'
-
-    jobs:
-      - 'k8-install'
-
-- job-template:
-    id: 'k8-install'
-    name: 'kubespray-multinode-install'
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/k8install.yaml  <br /><br />
-      Validation job for kubespray installation script provided to users/operators
-
-    properties:
-      - 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: 'qa-testvm-pod'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: branch
-          default: 'master'
-          description: 'Name of the repo branch to use'
-
-      - string:
-          name: configRepoUrl
-          default: 'https://gerrit.opencord.org/pod-configs'
-          description: 'The URL of the POD configs repository'
-
-      - string:
-          name: configRepoBaseDir
-          default: 'pod-configs/'
-          description: 'The directory inside the POD configs repository'
-
-      - string:
-          name: configRepoFile
-          default: 'kubernetes-configs/flex-onf-pod1.yml'
-          description: 'The deployment config file'
-
-      - string:
-          name: podName
-          default: 'flex-onf-pod1'
-          description: 'Name of pod'
-
-    project-type: pipeline
-    concurrent: false
-
-    dsl: !include-raw-escape: pipeline/kubespray-install.groovy
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 H 10 31/3 * *
-
-# [EOF]
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
deleted file mode 100644
index 7d336ba..0000000
--- a/jjb/omec-ci.yaml
+++ /dev/null
@@ -1,1259 +0,0 @@
----
-# omec-ci jobs
-# Uses github pull request builder to trigger and Jenkinsfiles from this repo
-#  https://github.com/omec-project/omec-project-ci
-
-# generic OMEC test-case jobs, shared by other projects and triggered within pipelines
-- project:
-    name: omec
-    build-node: 'intel-102'
-    github-organization: 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-
-    jobs:
-      - 'omec-tc1'
-      - 'omec-tc2'
-      - 'omec-deploy':
-          pod: 'dev'
-          build-node: 'omec-ci'
-          cp-context: 'acc-dev-gcp'
-          dp-context: 'ace-dev-menlo'
-          central-config: 'acc-dev-gcp/app_values/omec-cp.yaml'
-          edge-config: 'ace-dev-menlo/app_values/omec-upf.yaml'
-      - 'omec-ng40-test':
-          pod: 'dev'
-          build-node: 'omec-ci'
-          ng40-vm: 'ng40@192.168.122.101'
-          cp-context: 'acc-dev-gcp'
-          dp-context: 'ace-dev-menlo'
-      - 'omec-archive-artifacts':
-          pod: 'dev'
-          build-node: 'omec-ci'
-          cp-context: 'acc-dev-gcp'
-          dp-context: 'ace-dev-menlo'
-          log-since: '1h'
-      - 'omec-post-results':
-          pod: 'dev'
-          build-node: 'omec-ci'
-      - 'omec-postmerge':
-          project: '{name}'
-          build-node: 'omec-ci'
-          c3po-branch-name: 'master'
-          spgw-branch-name: 'master'
-          nucleus-branch-name: 'master'
-          upf-branch-name: 'master'
-          pipeline-file: 'omec-postmerge.groovy'
-      - 'omec-nightly':
-          pod: 'dev'
-          build-node: 'omec-ci'
-          type: 'func'
-          build-timeout: 30
-          ntl-file: 'func.ntl'
-          time: '1'
-          desc: |
-            <img src="https://jenkins.opencord.org/job/omec_func_dev/lastCompletedBuild/artifact/plots/plot.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/>
-      - 'omec-nightly':
-          pod: 'dev'
-          build-node: 'omec-ci'
-          type: 'scale'
-          build-timeout: 180
-          ntl-file: 'scale-16k-rate10.ntl'
-          time: '2'
-          desc: |
-            <img src="https://jenkins.opencord.org/job/omec_scale_dev/lastCompletedBuild/artifact/plots/attach.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/><br />
-            ----------<br />
-            <img src="https://jenkins.opencord.org/job/omec_scale_dev/lastCompletedBuild/artifact/plots/detach.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/><br />
-            ----------<br />
-            <img src="https://jenkins.opencord.org/job/omec_scale_dev/lastCompletedBuild/artifact/plots/ping.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/><br />
-
-# for ngic-rtc
-- project:
-    name: ngic-rtc
-    project: '{name}'
-
-    build-node: 'intel-102'
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-combined':
-          pipeline-file: 'Jenkinsfile-omec-combined.groovy'
-          mme-repo: 'Nucleus'
-      - 'omec-install':
-          sub-project: '{name}'
-          branch: 'central-cp-multi-upfs'
-          pipeline-file: 'Jenkinsfile-omec-install-ngic-rtc-vnf.groovy'
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-reuse':
-          pipeline-file: 'omec-reuse-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'docker-publish-github':
-          build-timeout: 30
-          docker-repo: 'omecproject'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
-      - 'omec-container'
-
-# for c3po
-- project:
-    name: c3po
-    project: '{name}'
-
-    build-node: 'intel-102'
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-combined':
-          pipeline-file: 'Jenkinsfile-omec-combined.groovy'
-          mme-repo: 'Nucleus'
-      - 'omec-install':
-          sub-project: 'c3po-sgx'
-          branch: 'master'
-          pipeline-file: 'Jenkinsfile-omec-install-c3po-sgx-vnf.groovy'
-      - 'omec-install':
-          sub-project: 'c3po-hss'
-          branch: 'master'
-          pipeline-file: 'Jenkinsfile-omec-install-c3po-hss-vnf.groovy'
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-reuse':
-          pipeline-file: 'omec-reuse-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'docker-publish-github':
-          build-timeout: 30
-          docker-repo: 'omecproject'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
-      - 'omec-container'
-      - 'omec-container-remote':
-          pod: 'ci-4g'
-          remote-jenkins-name: 'Aether Jenkins'
-          pipeline-file: 'omec-container-remote.groovy'
-
-# for openmme
-- project:
-    name: openmme
-    project: '{name}'
-
-    build-node: 'intel-102'
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-combined':
-          pipeline-file: 'Jenkinsfile-omec-combined.groovy'
-          mme-repo: 'openmme'
-      - 'omec-install':
-          sub-project: '{name}'
-          branch: 'master'
-          pipeline-file: 'Jenkinsfile-omec-install-openmme-vnf.groovy'
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-reuse':
-          pipeline-file: 'omec-reuse-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'docker-publish-github':
-          build-timeout: 30
-          docker-repo: 'omecproject'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-
-# for nucleus
-- project:
-    name: Nucleus
-    project: '{name}'
-
-    build-node: 'intel-102'
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-combined':
-          pipeline-file: 'Jenkinsfile-omec-combined.groovy'
-          mme-repo: 'Nucleus'
-      - 'omec-install':
-          sub-project: '{name}'
-          branch: 'master'
-          pipeline-file: 'Jenkinsfile-omec-install-Nucleus-vnf.groovy'
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-reuse':
-          pipeline-file: 'omec-reuse-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-cppcheck':
-          pipeline-file: 'omec-cppcheck.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'docker-publish-github':
-          build-timeout: 60
-          docker-repo: 'omecproject'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-container'
-      - 'omec-container-remote':
-          pod: 'ci-4g'
-          remote-jenkins-name: 'Aether Jenkins'
-          pipeline-file: 'omec-container-remote.groovy'
-
-# for freediameter
-- project:
-    name: freediameter
-    project: '{name}'
-
-    build-node: 'intel-102'
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-reuse':
-          pipeline-file: 'omec-reuse-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-
-# for ignite
-- project:
-    name: ignite
-    project: '{name}'
-
-    build-node: 'intel-102'
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-      - 'omec-reuse':
-          pipeline-file: 'omec-reuse-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-
-# Combined pipeline
-- job-template:
-    id: 'omec-combined'
-    name: 'omec_{project}_combined'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    disabled: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - "omec_.*_combined"
-
-    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 executor node to run the job on'
-
-      - string:
-          name: project
-          default: '{project}'
-          description: 'Name of the project'
-
-      - string:
-          name: mmeRepo
-          default: '{mme-repo}'
-          description: 'Name of the MME repo to test (openmme/Nucleus)'
-
-    triggers:
-      - cord-infra-github-pr-trigger:
-          github_pr_org_list: '{obj:github_pr_org_list}'
-          github_pr_auth_id: '{github_pr_auth_id}'
-          status_context: 'CORD Jenkins - Combined Steps Verification'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: '{pipeline-file}'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# install jobs, run for each project
-- job-template:
-    id: 'omec-install'
-    name: 'omec_{sub-project}_install'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    disabled: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-
-    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 executor node to run the job on'
-
-      - string:
-          name: project
-          default: '{project}'
-          description: 'Name of the project'
-
-      - string:
-          name: branch
-          default: '{branch}'
-          description: 'Branch of the project'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: '{pipeline-file}'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# FOSSA License Scan
-- job-template:
-    id: 'omec-fossa'
-    name: 'omec_{project}_fossa'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-          name: ghprbPullId
-          default: '$ghprbPullId'
-          description: 'Pull request number to fetch changes from. Leave blank to run manually.'
-
-      - string:
-          name: branch
-          default: '$ghprbTargetBranch'
-          description: 'Branch to run. Only used when manually run.'
-
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: project
-          default: '{project}'
-          description: 'Name of the project'
-
-      - string:
-          name: ghprbGhRepository
-          default: '{github-organization}/{project}'
-          description: 'Repository of the project.'
-
-    triggers:
-      - cord-infra-github-pr-trigger:
-          github_pr_org_list: '{obj:github_pr_org_list}'
-          github_pr_auth_id: '{github_pr_auth_id}'
-          status_context: 'CORD Jenkins - FOSSA Verification'
-
-    concurrent: false
-
-    project-type: pipeline
-    dsl: !include-raw-escape: pipeline/{pipeline-file}
-
-# REUSE License Scan
-- job-template:
-    id: 'omec-reuse'
-    name: 'omec_{project}_reuse'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-          name: ghprbPullId
-          default: '$ghprbPullId'
-          description: 'Pull request number to fetch changes from. Leave blank to run manually.'
-
-      - string:
-          name: branch
-          default: '$ghprbTargetBranch'
-          description: 'Branch to run. Only used when manually run.'
-
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: project
-          default: '{project}'
-          description: 'Name of the project'
-
-      - string:
-          name: ghprbGhRepository
-          default: '{github-organization}/{project}'
-          description: 'Repository of the project.'
-
-    triggers:
-      - cord-infra-github-pr-trigger:
-          github_pr_org_list: '{obj:github_pr_org_list}'
-          github_pr_auth_id: '{github_pr_auth_id}'
-          status_context: 'CORD Jenkins - Licenses Verification'
-
-    concurrent: false
-
-    project-type: pipeline
-    dsl: !include-raw-escape: pipeline/{pipeline-file}
-
-# cppcheck
-- job-template:
-    id: 'omec-cppcheck'
-    name: 'omec_{project}-cppcheck'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-          name: ghprbPullId
-          default: '$ghprbPullId'
-          description: 'Pull request number to fetch changes from. Leave blank to run manually.'
-
-      - string:
-          name: branch
-          default: '$ghprbTargetBranch'
-          description: 'Branch to run. Only used when manually run.'
-
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: project
-          default: '{project}'
-          description: 'Name of the project'
-
-      - string:
-          name: ghprbGhRepository
-          default: '{github-organization}/{project}'
-          description: 'Repository of the project.'
-
-    triggers:
-      - cord-infra-github-pr-trigger:
-          github_pr_org_list: '{obj:github_pr_org_list}'
-          github_pr_auth_id: '{github_pr_auth_id}'
-          status_context: 'CORD Jenkins - cppcheck Verification'
-
-    concurrent: false
-
-    project-type: pipeline
-    dsl: !include-raw-escape: pipeline/{pipeline-file}
-
-# tests
-- job-template:
-    id: 'omec-tc1'
-    name: 'omec_tc1'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    disabled: true
-
-    properties:
-      - 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 executor node to run the job on'
-
-      - string:
-          name: mmeRepo
-          default: 'openmme'
-          description: 'Name of the MME repo to test (openmme/Nucleus)'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-test-TC1.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/omec-project/omec-project-ci'
-            branches:
-              - 'master'
-
-- job-template:
-    id: 'omec-tc2'
-    name: 'omec_tc2'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    disabled: true
-
-    properties:
-      - 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 executor node to run the job on'
-
-      - string:
-          name: mmeRepo
-          default: 'openmme'
-          description: 'Name of the MME repo to test (openmme/Nucleus)'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-test-TC2.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/omec-project/omec-project-ci'
-            branches:
-              - 'master'
-
-# Post-merge job
-# Triggered by Github pull request merge
-- job-template:
-    id: omec-postmerge
-    name: '{project}_postmerge'
-    description: |
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    triggers:
-      - cord-infra-github-pr-trigger-merge:
-          project: '{project}'
-
-    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: registryProxy
-          default: '{registry-proxy}'
-          description: 'Harbor proxy which caches dockerhub images'
-
-      - string:
-          name: repoName
-          default: ''
-          description: 'Name of the git repo. Populated by Generic Webhook Trigger'
-
-      - string:
-          name: repoUrl
-          default: ''
-          description: 'URL to the git repo. Populated by Generic Webhook Trigger'
-
-      - string:
-          name: branchName
-          default: ''
-          description: 'Branch of the project. Populated by Generic Webhook Trigger'
-
-      - string:
-          name: commitHash
-          default: ''
-          description: 'SHA string of the merged commit. Populated by Generic Webhook Trigger'
-
-      - string:
-          name: c3poBranchName
-          default: '{c3po-branch-name}'
-          description: 'Branch name of c3po repo which we run tests against'
-
-      - string:
-          name: spgwBranchName
-          default: '{spgw-branch-name}'
-          description: 'Branch name of spgw repo which we run tests against'
-
-      - string:
-          name: nucleusBranchName
-          default: '{nucleus-branch-name}'
-          description: 'Branch name of Nucleus repo which we run tests against'
-
-      - string:
-          name: upfBranchName
-          default: '{upf-branch-name}'
-          description: 'Branch name of upf-epc repo which we run tests against'
-
-      - string:
-          name: maintainers
-          default: 'jeremyr@opennetworking.org, you@opennetworking.org'
-          description: "The person that sould be notified if this job fails"
-
-    project-type: pipeline
-    concurrent: false
-
-    dsl: !include-raw-escape: pipeline/{pipeline-file}
-
-# OMEC CI job which builds docker images, deploys and tests OMEC
-- job-template:
-    id: 'omec-container'
-    name: 'omec_{project}_container'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    disabled: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - ".*_container"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-          name: buildNode
-          default: 'omec-ci'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: project
-          default: '{project}'
-          description: 'Name of the project'
-
-      - string:
-          name: ghprbTargetBranch
-          default: '$ghprbTargetBranch'
-          description: 'GitHub Pull-Request builder value. Replace default value to test manually.'
-
-      - string:
-          name: ghprbPullId
-          default: '$ghprbPullId'
-          description: 'GitHub Pull-Request builder value. Replace default value to test manually.'
-
-      - string:
-          name: ghprbActualCommit
-          default: '$ghprbActualCommit'
-          description: 'GitHub Pull-Request builder value. Replace default value to test manually.'
-
-      - string:
-          name: registry
-          default: '{registry}'
-          description: 'Docker registry that stores images built for CI testing'
-
-      - string:
-          name: registryProxy
-          default: '{registry-proxy}'
-          description: 'Harbor proxy which caches dockerhub images'
-
-      - string:
-          name: c3poBranch
-          default: 'master'
-          description: 'Branch name of c3po repo which we run tests against'
-
-      - string:
-          name: nucleusBranch
-          default: 'master'
-          description: 'Branch name of Nucleus repo which we run tests against'
-
-      - string:
-          name: spgwBranch
-          default: 'master'
-          description: 'Branch name of spgw repo which we run tests against'
-
-      - string:
-          name: upfBranch
-          default: 'master'
-          description: 'Branch name of upf-epc repo which we run tests against'
-
-    triggers:
-      - cord-infra-github-pr-trigger:
-          github_pr_org_list: '{obj:github_pr_org_list}'
-          github_pr_auth_id: '{github_pr_auth_id}'
-          status_context: 'CORD Jenkins - Container Based Verification'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-container.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# OMEC deployment job
-- job-template:
-    id: 'omec-deploy'
-    name: 'omec_deploy_{pod}'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created from job-template {id} from ci-management/jjb/omec-ci.yaml <br />
-
-    disabled: true
-
-    properties:
-      - 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 executor node to run the job on.'
-
-      - string:
-          name: cpContext
-          default: '{cp-context}'
-          description: 'K8S context for omec control plane.'
-
-      - string:
-          name: dpContext
-          default: '{dp-context}'
-          description: 'K8S context for omec data plane.'
-
-      - string:
-          name: centralConfig
-          default: '{central-config}'
-          description: 'Directory name for central yaml files under aether-pod-configs.'
-
-      - string:
-          name: edgeConfig
-          default: '{edge-config}'
-          description: 'Directory name for edge yaml files under aether-pod-configs.'
-
-      - string:
-          name: hssdbImage
-          default: '{registry-proxy}/c3po-hssdb:master-latest'
-          description: 'Docker image for hssdb. Leave empty to use default helm-charts value'
-
-      - string:
-          name: hssImage
-          default: '{registry-proxy}/c3po-hss:master-latest'
-          description: 'Docker image for hss. Leave empty to use default helm-charts value'
-
-      - string:
-          name: mmeImage
-          default: '{registry-proxy}/nucleus:master-latest'
-          description: 'Docker image for mme. Leave empty to use default helm-charts value'
-
-      - string:
-          name: spgwcImage
-          default: '{registry-proxy}/spgw:master-latest'
-          description: 'Docker image for spgwc. Leave empty to use default helm-charts value'
-
-      - string:
-          name: bessImage
-          default: '{registry-proxy}/upf-epc-bess:master-latest'
-          description: 'Docker image for bess. Leave empty to use default helm-charts value'
-
-      - string:
-          name: zmqifaceImage
-          default: '{registry-proxy}/upf-epc-cpiface:master-latest'
-          description: 'Docker image for zmqiface. Leave empty to use default helm-charts value'
-
-      - string:
-          name: pfcpifaceImage
-          default: '{registry-proxy}/upf-epc-pfcpiface:master-latest'
-          description: 'Docker image for pfcpiface. Leave empty to use default helm-charts value'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-deploy.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# OMEC test job
-- job-template:
-    id: 'omec-ng40-test'
-    name: 'omec_ng40-test_{pod}'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created from job-template {id} from ci-management/jjb/omec-ci.yaml <br />
-
-    disabled: true
-
-    properties:
-      - 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 executor node to run the job on.'
-
-      - string:
-          name: timeout
-          default: '30'
-          description: 'Timeout period for this pipeline in minutes.'
-
-      - string:
-          name: ng40VM
-          default: '{ng40-vm}'
-          description: 'user@IP for accessing NG40 VM from the build node.'
-
-      - string:
-          name: ntlFile
-          default: 'ci.ntl'
-          description: 'NG40 test automation file'
-
-      - string:
-          name: cpContext
-          default: '{cp-context}'
-          description: 'K8S context for omec control plane.'
-
-      - string:
-          name: dpContext
-          default: '{dp-context}'
-          description: 'K8S context for omec data plane.'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-ng40-test.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# OMEC archive artifacts job
-- job-template:
-    id: 'omec-archive-artifacts'
-    name: 'omec_archive-artifacts_{pod}'
-    project-type: pipeline
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created from job-template {id} from ci-management/jjb/omec-ci.yaml <br />
-
-    disabled: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: 2
-
-    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 executor node to run the job on.'
-
-      - string:
-          name: cpContext
-          default: '{cp-context}'
-          description: 'K8S context for omec control plane.'
-
-      - string:
-          name: dpContext
-          default: '{dp-context}'
-          description: 'K8S context for omec data plane.'
-
-      - string:
-          name: logSince
-          default: '{log-since}'
-          description: 'Only upload logs newer than a relative duration e.g. 1h. Leave empty if logSinceTime is specified'
-
-      - string:
-          name: logSinceTime
-          default: ''
-          description: 'Only upload logs newer than a date (RFC3339). Leave empty if logSince is specified'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-archive-artifacts.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# OMEC nightly job
-- job-template:
-    id: 'omec-nightly'
-    name: 'omec_{type}_{pod}'
-    project-type: pipeline
-
-    description: |
-      Created from job-template {id} from ci-management/jjb/omec-ci.yaml <br />
-      {desc}
-
-    disabled: true
-
-    properties:
-      - 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 executor node to run the job on'
-
-      - string:
-          name: testType
-          default: '{type}'
-          description: 'Type of test'
-
-      - string:
-          name: pod
-          default: '{pod}'
-          description: 'Name of OMEC POD'
-
-      - string:
-          name: timeout
-          default: '{build-timeout}'
-          description: 'Timeout period for this pipeline in minutes'
-
-      - string:
-          name: ntlFile
-          default: '{ntl-file}'
-          description: 'NG40 test automation file'
-
-      - bool:
-          name: redeploy
-          default: true
-          description: 'Redeploy OMEC before running tests if set to true'
-
-      - string:
-          name: hssdbImage
-          default: '{registry-proxy}/c3po-hssdb:master-latest'
-          description: 'Docker image for hssdb. Leave empty to use default helm-charts value'
-
-      - string:
-          name: hssImage
-          default: '{registry-proxy}/c3po-hss:master-latest'
-          description: 'Docker image for hss. Leave empty to use default helm-charts value'
-
-      - string:
-          name: mmeImage
-          default: '{registry-proxy}/nucleus:master-latest'
-          description: 'Docker image for mme. Leave empty to use default helm-charts value'
-
-      - string:
-          name: spgwcImage
-          default: '{registry-proxy}/spgw:master-latest'
-          description: 'Docker image for spgwc. Leave empty to use default helm-charts value'
-
-      - string:
-          name: bessImage
-          default: '{registry-proxy}/upf-epc-bess:master-latest'
-          description: 'Docker image for bess. Leave empty to use default helm-charts value'
-
-      - string:
-          name: zmqifaceImage
-          default: '{registry-proxy}/upf-epc-cpiface:master-latest'
-          description: 'Docker image for zmqiface. Leave empty to use default helm-charts value'
-
-      - string:
-          name: pfcpifaceImage
-          default: '{registry-proxy}/upf-epc-pfcpiface:master-latest'
-          description: 'Docker image for pfcpiface. Leave empty to use default helm-charts value'
-
-      - string:
-          name: maintainers
-          default: 'you@opennetworking.org'
-          description: "The person that sould be notified if this job fails"
-
-    concurrent: false
-
-    triggers:
-      - timed: |
-          TZ=America/Los_Angeles
-          H {time} * * *
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-nightly.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# OMEC post results job
-- job-template:
-    id: 'omec-post-results'
-    name: 'omec_post-results_{pod}'
-    project-type: pipeline
-
-    description: |
-      Created from job-template {id} from ci-management/jjb/omec-ci.yaml <br />
-
-    disabled: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: 2
-
-    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 executor node to run the job on'
-
-      - string:
-          name: pod
-          default: '{pod}'
-          description: 'Name of OMEC pod'
-
-      - string:
-          name: testType
-          default: 'scale'
-          description: 'Type of test e.g. scale, func, etc.'
-
-      - string:
-          name: buildNumber
-          default: '0'
-          description: 'Build number of upstream job'
-
-    concurrent: false
-
-    pipeline-scm:
-      script-path: 'Jenkinsfile-omec-post-results.groovy'
-      scm:
-        - git:
-            url: 'https://github.com/{github-organization}/omec-project-ci'
-            branches:
-              - 'master'
-
-# OMEC CI job which replaces the original container job
-- job-template:
-    id: 'omec-container-remote'
-    name: 'omec_{project}_container_remote'
-
-    description: |
-      Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-      - github:
-          url: 'https://github.com/{github-organization}/{project}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-          name: buildNode
-          default: 'omec-ci'
-          description: 'Name of the Jenkins executor node to run the job on'
-
-      - string:
-          name: project
-          default: '{project}'
-          description: 'Name of the project'
-
-      - string:
-          name: pod
-          default: '{pod}'
-          description: 'Name of OMEC pod'
-
-      - string:
-          name: remoteJenkinsName
-          default: '{remote-jenkins-name}'
-          description: 'Name of the remote Jenkins instance that runs the job'
-
-      - string:
-          name: ghprbTargetBranch
-          default: '$ghprbTargetBranch'
-          description: 'GitHub Pull-Request builder value. Replace default value to test manually.'
-
-      - string:
-          name: ghprbPullId
-          default: '$ghprbPullId'
-          description: 'GitHub Pull-Request builder value. Replace default value to test manually.'
-
-      - string:
-          name: ghprbActualCommit
-          default: '$ghprbActualCommit'
-          description: 'GitHub Pull-Request builder value. Replace default value to test manually.'
-
-    triggers:
-      - cord-infra-github-pr-trigger:
-          github_pr_org_list: '{obj:github_pr_org_list}'
-          github_pr_auth_id: '{github_pr_auth_id}'
-          status_context: 'CORD Jenkins - Container Based Verification'
-
-    concurrent: false
-
-    project-type: pipeline
-    dsl: !include-raw-escape: pipeline/{pipeline-file}
-
-# [EOF]
diff --git a/jjb/repos/helm-charts.yaml b/jjb/repos/helm-charts.yaml
deleted file mode 100644
index de127fb..0000000
--- a/jjb/repos/helm-charts.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# SPDX-FileCopyrightText: 2022-2024 Open Networking Foundation (ONF) and the ONF Contributors
-# SPDX-License-Identifier: Apache-2.0
-
-# These are the CORD specific helm charts
-
-- project:
-    name: helm-charts
-    project: '{name}'
-    project-regexp: '^{name}$'
-    branch-regexp: '{modern-branches-regexp}'
-
-    jobs:
-      - 'verify-licensed'
-      - 'tag-check'
-      - 'helm-lint':
-          branch-regexp: '{modern-branches-regexp}'
-      - 'version-tag'
-      - 'publish-helm-repo'
-
-# [EOF]
diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
index ce896ab..06aa4ce 100644
--- a/jjb/repos/voltha-helm-charts.yaml
+++ b/jjb/repos/voltha-helm-charts.yaml
@@ -14,10 +14,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - 'verify-voltha-helm-charts-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-helm-charts-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
@@ -47,13 +43,6 @@
           pipeline-branch: 'voltha-2.13'
 
 - job-group:
-    name: 'verify-voltha-helm-charts-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-
-- job-group:
     name: 'verify-voltha-helm-charts-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 0a1d28d..1a1c4e2 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -99,42 +99,6 @@
           time-trigger: "H H/23 * * *"
 
 # -----------------------------------------------------------------------
-# https://docs.voltha.org/master/release_notes/voltha_2.12.html#id7
-# https://wiki.opennetworking.org/display/VOLTHA/v2.12+Deployments
-# -----------------------------------------------------------------------
-      - 'software-upgrades-test':
-          name: 'periodic-software-upgrade-test-bbsim-2.12'
-          pipeline-script: 'voltha/voltha-2.12/software-upgrades.groovy'
-          pipeline-branch: 'voltha-2.12'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
-          code-branch: 'voltha-2.12'
-          aaa-version: '2.10.3'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.10.3/aaa-app-2.10.3.oar'
-          olt-version: '5.2.4'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.2.4/olt-app-5.2.4.oar'
-          dhcpl2relay-version: '2.10.0'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.10.0/dhcpl2relay-app-2.10.0.oar'
-          igmpproxy-version: '2.8.0'
-          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.8.0/onos-app-igmpproxy-app-2.8.0.oar'
-          sadis-version: '5.11.1'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.11.1/sadis-app-5.11.1.oar'
-          mcast-version: '2.9.0'
-          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.9.0/mcast-app-2.9.0.oar'
-          kafka-version: '2.12.0'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.12.0/kafka-2.12.0.oar'
-          openolt-adapter-deploy-base-tag: '4.2.6'
-          openonu-adapter-deploy-base-tag: '2.2.8'
-          rw-core-deploy-base-tag: '3.1.8'
-          ofagent-deploy-base-tag: '2.1.2'
-          onu-image-version: 'BBSM_IMG_00002'
-          onu-image-url: 'http://bbsim0:50074/images/software-image.img'
-          onu-image-vendor: 'BBSM'
-          onu-image-activate-on-success: 'false'
-          onu-image-commit-on-success: 'false'
-          onu-image-crc: '0'
-          time-trigger: "H H/23 * * *"
-
-# -----------------------------------------------------------------------
 # https://docs.voltha.org/master/release_notes/voltha_2.11.html#onos-apps
 # -----------------------------------------------------------------------
       - 'software-upgrades-test':
diff --git a/jjb/verify/aaa.yaml b/jjb/verify/aaa.yaml
index e4c8b57..2dd2119 100644
--- a/jjb/verify/aaa.yaml
+++ b/jjb/verify/aaa.yaml
@@ -12,11 +12,6 @@
       - 'aaa-jobs':
           branch-regexp: '^((?!aaa-1\.10).*)$'
 
-      - 'aaa-jobs-legacy':
-          branch-regexp: '^(aaa-1.10)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-
 - job-group:
     name: 'aaa-jobs-common'
     jobs:
@@ -28,10 +23,4 @@
       - 'maven-test'
       - 'maven-publish'
 
-- job-group:
-    name: 'aaa-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
 # [EOF]
diff --git a/jjb/verify/acordion.yaml b/jjb/verify/acordion.yaml
deleted file mode 100644
index ec15eb6..0000000
--- a/jjb/verify/acordion.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'acordion' repo
-
-- project:
-    name: acordion
-    project: '{name}'
-
-    jobs:
-      - 'verify-acordion-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-acordion-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/addressmanager.yaml b/jjb/verify/addressmanager.yaml
deleted file mode 100644
index 811c0fe..0000000
--- a/jjb/verify/addressmanager.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'addressmanager' repo
-
-- project:
-    name: addressmanager
-    project: '{name}'
-
-    jobs:
-      - 'verify-addressmanager-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-addressmanager-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_addressmanager_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/alpine-grpc-base.yaml b/jjb/verify/alpine-grpc-base.yaml
deleted file mode 100644
index f4d9d6c..0000000
--- a/jjb/verify/alpine-grpc-base.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# verification jobs for 'alpine-grpc-base' repo
-
-- project:
-    name: alpine-grpc-base
-    project: '{name}'
-
-    jobs:
-      - 'verify-alpine-grpc-base-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-alpine-grpc-base-jobs'
-
-- job-group:
-    name: 'verify-alpine-grpc-base-jobs'
-    jobs:
-      - 'verify-licensed'
-
-- job-group:
-    name: 'publish-alpine-grpc-base-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
deleted file mode 100644
index 2e5255b..0000000
--- a/jjb/verify/att-workflow-driver.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'att-workflow-driver' repo
-
-- project:
-    name: att-workflow-driver
-    project: '{name}'
-
-    jobs:
-      - 'verify-att-workflow-driver-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-att-workflow-driver-jobs'
-
-- job-group:
-    name: 'verify-att-workflow-driver-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_att-workflow-driver_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_att-workflow-driver-unit-test'
-
-- job-group:
-    name: 'publish-att-workflow-driver-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org, andy@opennetworking.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/automation-tools.yaml b/jjb/verify/automation-tools.yaml
deleted file mode 100644
index 02c0825..0000000
--- a/jjb/verify/automation-tools.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# verification jobs for 'automation-tools' repo
-
-- project:
-    name: automation-tools
-    project: '{name}'
-
-    jobs:
-      - 'verify-automation-tools-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-automation-tools-jobs'
-
-- job-group:
-    name: 'verify-automation-tools-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'verify-ansible-lint':
-          skip-dirs: "comac comac-in-a-box"
-          dependency-jobs: 'verify_automation-tools_tag-collision'
-      - 'verify-shellcheck':
-          dependency-jobs: 'verify_automation-tools_ansible-lint'
-
-- job-group:
-    name: 'publish-automation-tools-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index f7b67e6..353f01a 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -33,9 +33,6 @@
       - 'verify-bbsim-sadis-server-jobs-voltha-2.13':
           name-extension: '-voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - 'verify-bbsim-sadis-server-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
       - 'verify-bbsim-sadis-server-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           branch-regexp: '^voltha-2.11$'
@@ -70,13 +67,6 @@
           pipeline-branch: 'voltha-2.13'
 
 - job-group:
-    name: 'verify-bbsim-sadis-server-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-
-- job-group:
     name: 'verify-bbsim-sadis-server-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index e09b0e6..27f8d35 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -35,10 +35,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - 'verify-bbsim-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
       - 'verify-bbsim-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
@@ -101,30 +97,6 @@
               logging: true
 
 - job-group:
-    name: 'verify-bbsim-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
-          testTargets: |
-            - target: sanity-bbsim-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-
-- job-group:
     name: 'verify-bbsim-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/certification.yaml b/jjb/verify/certification.yaml
deleted file mode 100644
index ee90c80..0000000
--- a/jjb/verify/certification.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'certification' repo
-
-- project:
-    name: certification
-    project: '{name}'
-
-    jobs:
-      - 'verify-certification-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-certification-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/chameleon.yaml b/jjb/verify/chameleon.yaml
deleted file mode 100644
index 06e3f15..0000000
--- a/jjb/verify/chameleon.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# verification jobs for 'chameleon' repo
-
-- project:
-    name: chameleon
-    project: '{name}'
-
-    jobs:
-      - 'verify-chameleon-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-          junit-allow-empty-results: true
-      - 'publish-chameleon-jobs'
-
-- job-group:
-    name: 'verify-chameleon-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'python-unit-test':
-          dependency-jobs: 'verify_chameleon_tag-collision'
-      - 'xos-auth-test':
-          dependency-jobs: 'verify_chameleon_unit-test'
-
-- job-group:
-    name: 'publish-chameleon-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "scottb@opennetworking.org"
-          build-timeout: 30
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/comac-helm-charts.yaml b/jjb/verify/comac-helm-charts.yaml
deleted file mode 100644
index 39c2bcd..0000000
--- a/jjb/verify/comac-helm-charts.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'comac-helm-charts' repo
-
-- project:
-    name: comac-helm-charts
-    project: '{name}'
-
-    jobs:
-      - 'verify-comac-helm-charts-jobs':
-          branch-regexp: '{modern-branches-regexp}'
-
-- job-group:
-    name: 'verify-comac-helm-charts-jobs'
-    jobs:
-      - 'verify-licensed'
-
-
-# [EOF]
diff --git a/jjb/verify/config.yaml b/jjb/verify/config.yaml
deleted file mode 100644
index 59215f8..0000000
--- a/jjb/verify/config.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-# jobs for 'config' repo
-
-- project:
-    name: config
-    project: '{name}'
-
-    jobs:
-      - 'config-jobs-common':
-          branch-regexp: '^(.*)$'
-
-      - 'config-jobs':
-          branch-regexp: '^(master)$'
-          junit-allow-empty-results: true
-
-      - 'config-jobs-legacy':
-          branch-regexp: '^(config-1.5)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'config-jobs-common'
-    jobs:
-      - 'verify-licensed'
-
-- job-group:
-    name: 'config-jobs'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-- job-group:
-    name: 'config-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-
-# [EOF]
diff --git a/jjb/verify/cord-onos-publisher.yaml b/jjb/verify/cord-onos-publisher.yaml
deleted file mode 100644
index b009696..0000000
--- a/jjb/verify/cord-onos-publisher.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'cord-onos-publisher' repo
-
-- project:
-    name: cord-onos-publisher
-    project: '{name}'
-
-    jobs:
-      - 'verify-cord-onos-publisher-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-cord-onos-publisher-jobs'
-    jobs:
-      - 'verify-licensed'
-#      - 'make-unit-test':
-#         dest-gopath: "github.com/opencord"
-
-# [EOF]
diff --git a/jjb/verify/cord-platform.yaml b/jjb/verify/cord-platform.yaml
deleted file mode 100644
index 20f71da..0000000
--- a/jjb/verify/cord-platform.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'cord-platform' repo
-
-- project:
-    name: cord-platform
-    project: '{name}'
-
-    jobs:
-      - 'verify-cord-platform-jobs':
-          branch-regexp: '{platform-branches-regexp}'
-
-- job-group:
-    name: 'verify-cord-platform-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/cord-tester.yaml b/jjb/verify/cord-tester.yaml
deleted file mode 100644
index fb62766..0000000
--- a/jjb/verify/cord-tester.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# verification jobs for 'cord-tester' repo
-
-- project:
-    name: cord-tester
-    project: '{name}'
-
-    jobs:
-      - 'verify-cord-tester-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-cord-tester-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-          pypi-index: 'pypi'
-
-- job-group:
-    name: 'verify-cord-tester-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dependency-jobs: 'verify_cord-tester_tag-collision'
-          unit-test-targets: 'lint test'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-cord-tester-jobs'
-    jobs:
-      - 'pypi-publish':
-          pypi-module-dirs: 'cord-robot'
-          project-regexp: '^{name}$'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/cord-workflow-airflow.yaml b/jjb/verify/cord-workflow-airflow.yaml
deleted file mode 100644
index e3052c2..0000000
--- a/jjb/verify/cord-workflow-airflow.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'cord-workflow-airflow' repo
-
-- project:
-    name: cord-workflow-airflow
-    project: '{name}'
-
-    dest-gopath: "github.com/opencord"
-
-    jobs:
-      - 'verify-cord-workflow-airflow-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-cord-workflow-airflow-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-cord-workflow-airflow-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dependency-jobs: 'verify_cord-workflow-airflow_tag-collision'
-
-- job-group:
-    name: 'publish-cord-workflow-airflow-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/cord-workflow-controller-client.yaml b/jjb/verify/cord-workflow-controller-client.yaml
deleted file mode 100644
index e8233be..0000000
--- a/jjb/verify/cord-workflow-controller-client.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# verification jobs for 'cord-workflow-controller-client' repo
-
-- project:
-    name: cord-workflow-controller-client
-    project: '{name}'
-
-    dest-gopath: "github.com/opencord"
-
-    jobs:
-      - 'verify-cord-workflow-controller-client-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-cord-workflow-controller-client-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-          pypi-index: 'pypi'
-
-- job-group:
-    name: 'verify-cord-workflow-controller-client-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dependency-jobs: 'verify_cord-workflow-controller-client_tag-collision'
-
-- job-group:
-    name: 'publish-cord-workflow-controller-client-jobs'
-    jobs:
-      - 'pypi-publish':
-          project-regexp: '^{name}$'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/cord-workflow-controller.yaml b/jjb/verify/cord-workflow-controller.yaml
deleted file mode 100644
index 4d8908b..0000000
--- a/jjb/verify/cord-workflow-controller.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'cord-workflow-controller' repo
-
-- project:
-    name: cord-workflow-controller
-    project: '{name}'
-
-    dest-gopath: "github.com/opencord"
-
-    jobs:
-      - 'verify-cord-workflow-controller-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-cord-workflow-controller-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-cord-workflow-controller-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dependency-jobs: 'verify_cord-workflow-controller_tag-collision'
-
-- job-group:
-    name: 'publish-cord-workflow-controller-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/cord-workflow-probe.yaml b/jjb/verify/cord-workflow-probe.yaml
deleted file mode 100644
index eb90a6b..0000000
--- a/jjb/verify/cord-workflow-probe.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# verification jobs for 'cord-workflow-probe' repo
-
-- project:
-    name: cord-workflow-probe
-    project: '{name}'
-
-    dest-gopath: "github.com/opencord"
-
-    jobs:
-      - 'verify-cord-workflow-probe-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-cord-workflow-probe-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dependency-jobs: 'verify_cord-workflow-probe_tag-collision'
-          junit-allow-empty-results: true
-
-# [EOF]
diff --git a/jjb/verify/cord-workflow.yaml b/jjb/verify/cord-workflow.yaml
deleted file mode 100644
index fe1c678..0000000
--- a/jjb/verify/cord-workflow.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# verification jobs for 'cord-workflow' repo
-
-- project:
-    name: cord-workflow
-    project: '{name}'
-
-    dest-gopath: "github.com/opencord"
-
-    jobs:
-      - 'verify-cord-workflow-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-cord-workflow-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dependency-jobs: 'verify_cord-workflow_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/cord.yaml b/jjb/verify/cord.yaml
deleted file mode 100644
index 2c5c731..0000000
--- a/jjb/verify/cord.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'cord' repo
-
-- project:
-    name: cord
-    project: '{name}'
-
-    jobs:
-      - 'verify-cord-jobs':
-          branch-regexp: '{legacy-branches-regexp}'
-
-- job-group:
-    name: 'verify-cord-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'verify-ansible-lint':
-          dependency-jobs: 'verify_cord_licensed'
-
-# [EOF]
diff --git a/jjb/verify/cordctl.yaml b/jjb/verify/cordctl.yaml
deleted file mode 100644
index 17b65a3..0000000
--- a/jjb/verify/cordctl.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# verification jobs for 'cordctl' repo
-
-- project:
-    name: cordctl
-    project: '{name}'
-
-    dest-gopath: "github.com/opencord"
-
-    jobs:
-      - 'verify-cordctl-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'post-submit-cordctl-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-cordctl-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'lint test'
-          unit-test-keep-going: 'false'
-          dependency-jobs: 'verify_cordctl_tag-collision'
-
-- job-group:
-    name: 'post-submit-cordctl-jobs'
-    jobs:
-      - 'github-release':
-          dependency-jobs: 'version-tag_wildcard'
-          github-organization: 'opencord'
-          artifact-glob: 'release/*'
-
-# [EOF]
diff --git a/jjb/verify/device-management.yaml b/jjb/verify/device-management.yaml
deleted file mode 100644
index 155796f..0000000
--- a/jjb/verify/device-management.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# verification jobs for 'device-management' repo
-
-- project:
-    name: device-management
-    project: '{name}'
-
-    jobs:
-      - 'verify-device-management-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-device-management-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-device-management-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          junit-allow-empty-results: true
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
-      - 'device-management-patch-test':
-          pipeline-script: 'voltha/device-management-mock-tests.groovy'
-
-- job-group:
-    name: 'publish-device-management-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "scottb@opennetworking.org"
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/dhcpl2relay.yaml b/jjb/verify/dhcpl2relay.yaml
index a40205f..fb1d6fa 100644
--- a/jjb/verify/dhcpl2relay.yaml
+++ b/jjb/verify/dhcpl2relay.yaml
@@ -12,11 +12,6 @@
       - 'dhcpl2relay-jobs':
           branch-regexp: '^((?!dhcpl2relay-1\.6).*)$'
 
-      - 'dhcpl2relay-jobs-legacy':
-          branch-regexp: '^(dhcpl2relay-1.6)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-
 - job-group:
     name: 'dhcpl2relay-jobs-common'
     jobs:
@@ -28,10 +23,4 @@
       - 'maven-test'
       - 'maven-publish'
 
-- job-group:
-    name: 'dhcpl2relay-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
 # [EOF]
diff --git a/jjb/verify/dt-workflow-driver.yaml b/jjb/verify/dt-workflow-driver.yaml
deleted file mode 100644
index e895cf0..0000000
--- a/jjb/verify/dt-workflow-driver.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'dt-workflow-driver' repo
-
-- project:
-    name: dt-workflow-driver
-    project: '{name}'
-
-    jobs:
-      - 'verify-dt-workflow-driver-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-dt-workflow-driver-jobs'
-
-- job-group:
-    name: 'verify-dt-workflow-driver-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_dt-workflow-driver_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_dt-workflow-driver-unit-test'
-
-- job-group:
-    name: 'publish-dt-workflow-driver-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "carmelo@opennetworking.org, daniele@opennetworking.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/ecord.yaml b/jjb/verify/ecord.yaml
deleted file mode 100644
index 45932bb..0000000
--- a/jjb/verify/ecord.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'ecord' repo
-
-- project:
-    name: ecord
-    project: '{name}'
-
-    jobs:
-      - 'verify-ecord-jobs':
-          branch-regexp: '{legacy-branches-regexp}'
-
-- job-group:
-    name: 'verify-ecord-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'verify-ansible-lint':
-          dependency-jobs: 'verify_ecord_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/epc-service.yaml b/jjb/verify/epc-service.yaml
deleted file mode 100644
index 0d62eb4..0000000
--- a/jjb/verify/epc-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'epc-service' repo
-
-- project:
-    name: epc-service
-    project: '{name}'
-
-    jobs:
-      - 'verify-epc-service-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-epc-service-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/exampleservice.yaml b/jjb/verify/exampleservice.yaml
deleted file mode 100644
index 645effc..0000000
--- a/jjb/verify/exampleservice.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'exampleservice' repo
-
-- project:
-    name: exampleservice
-    project: '{name}'
-
-    jobs:
-      - 'verify-exampleservice-common':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-exampleservice-common'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
deleted file mode 100644
index 8e57de0..0000000
--- a/jjb/verify/fabric-crossconnect.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'fabric-crossconnect' repo
-
-- project:
-    name: fabric-crossconnect
-    project: '{name}'
-
-    jobs:
-      - 'verify-fabric-crossconnect-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-fabric-crossconnect-jobs'
-
-- job-group:
-    name: 'verify-fabric-crossconnect-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_fabric-crossconnect_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_fabric-crossconnect-unit-test'
-- job-group:
-    name: 'publish-fabric-crossconnect-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/fabric-tofino.yaml b/jjb/verify/fabric-tofino.yaml
deleted file mode 100644
index cfcd583..0000000
--- a/jjb/verify/fabric-tofino.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# jobs for 'fabric-tofino' repo
-
-- project:
-    name: fabric-tofino
-    project: '{name}'
-
-    jobs:
-      - 'fabric-tofino-jobs-common':
-          branch-regexp: '^(.*)$'
-
-      - 'fabric-tofino-jobs':
-          branch-regexp: '^(master)$'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'fabric-tofino-jobs-common'
-    jobs:
-      - 'verify-licensed'
-
-- job-group:
-    name: 'fabric-tofino-jobs'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-# [EOF]
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
deleted file mode 100644
index a444977..0000000
--- a/jjb/verify/fabric.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'fabric' repo
-
-- project:
-    name: fabric
-    project: '{name}'
-
-    jobs:
-      - 'verify-fabric-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-fabric-jobs'
-
-- job-group:
-    name: 'verify-fabric-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_fabric_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_fabric-unit-test'
-
-- job-group:
-    name: 'publish-fabric-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/go-manifest.yaml b/jjb/verify/go-manifest.yaml
deleted file mode 100644
index 811d86e..0000000
--- a/jjb/verify/go-manifest.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'go-manifest' repo
-
-- project:
-    name: go-manifest
-    project: '{name}'
-
-    jobs:
-      - 'verify-go-manifest-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-go-manifest-jobs'
-    jobs:
-      - 'verify-repo-manifest'
-
-
-# [EOF]
diff --git a/jjb/verify/goloxi.yaml b/jjb/verify/goloxi.yaml
deleted file mode 100644
index 21f82eb..0000000
--- a/jjb/verify/goloxi.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# verification jobs for 'goloxi' repo
-
-- project:
-    name: goloxi
-    project: '{name}'
-
-    jobs:
-      - 'verify-goloxi-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-goloxi-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'test'
-          junit-allow-empty-results: true
-
-# [EOF]
diff --git a/jjb/verify/grpc-robot.yaml b/jjb/verify/grpc-robot.yaml
deleted file mode 100644
index f64ee70..0000000
--- a/jjb/verify/grpc-robot.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'grpc-robot' repo
-
-- project:
-    name: grpc-robot
-    project: '{name}'
-
-    jobs:
-      - 'verify-grpc-robot-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-grpc-robot-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-          pypi-index: 'pypi'
-
-- job-group:
-    name: 'verify-grpc-robot-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-grpc-robot-jobs'
-    jobs:
-      - 'pypi-publish':
-          project-regexp: '^{name}$'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/hippie-oss.yaml b/jjb/verify/hippie-oss.yaml
deleted file mode 100644
index 9fba872..0000000
--- a/jjb/verify/hippie-oss.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'hippie-oss' repo
-
-- project:
-    name: hippie-oss
-    project: '{name}'
-
-    jobs:
-      - 'verify-hippie-oss-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-hippie-oss-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_hippie-oss_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/hss_db.yaml b/jjb/verify/hss_db.yaml
deleted file mode 100644
index 8ec7707..0000000
--- a/jjb/verify/hss_db.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'hss_db' repo
-
-- project:
-    name: hss_db
-    project: '{name}'
-
-    jobs:
-      - 'verify-hss_db-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-hss_db-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/igmp.yaml b/jjb/verify/igmp.yaml
deleted file mode 100644
index 829c266..0000000
--- a/jjb/verify/igmp.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-# jobs for 'igmp' repo
-
-- project:
-    name: igmp
-    project: '{name}'
-
-    jobs:
-      - 'igmp-jobs-common':
-          branch-regexp: '^(.*)$'
-
-      - 'igmp-jobs':
-          branch-regexp: '^((?!igmp-1\.4).*)$'
-
-      - 'igmp-jobs-legacy':
-          branch-regexp: '^(igmp-1.4)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-
-- job-group:
-    name: 'igmp-jobs-common'
-    jobs:
-      - 'verify-licensed'
-
-- job-group:
-    name: 'igmp-jobs'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-- job-group:
-    name: 'igmp-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-# [EOF]
diff --git a/jjb/verify/igmpproxy.yaml b/jjb/verify/igmpproxy.yaml
index 984c665..b83a053 100644
--- a/jjb/verify/igmpproxy.yaml
+++ b/jjb/verify/igmpproxy.yaml
@@ -13,12 +13,6 @@
           branch-regexp: '^((?!igmpproxy-1\.2).*)$'
           junit-allow-empty-results: true
 
-      - 'igmpproxy-jobs-legacy':
-          branch-regexp: '^(igmpproxy-1.2)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-          junit-allow-empty-results: true
-
 - job-group:
     name: 'igmpproxy-jobs-common'
     jobs:
@@ -30,10 +24,4 @@
       - 'maven-test'
       - 'maven-publish'
 
-- job-group:
-    name: 'igmpproxy-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
 # [EOF]
diff --git a/jjb/verify/internetemulator.yaml b/jjb/verify/internetemulator.yaml
deleted file mode 100644
index 113fddb..0000000
--- a/jjb/verify/internetemulator.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'internetemulator' repo
-
-- project:
-    name: internetemulator
-    project: '{name}'
-
-    jobs:
-      - 'verify-internetemulator-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-internetemulator-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/k8sepcservice.yaml b/jjb/verify/k8sepcservice.yaml
deleted file mode 100644
index f7d5b6e..0000000
--- a/jjb/verify/k8sepcservice.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'k8sepcservice' repo
-
-- project:
-    name: k8sepcservice
-    project: '{name}'
-
-    jobs:
-      - 'verify-k8sepcservice-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-k8sepcservice-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_k8sepcservice_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/kafka-onos.yaml b/jjb/verify/kafka-onos.yaml
index 70a7bcb..02bd167 100644
--- a/jjb/verify/kafka-onos.yaml
+++ b/jjb/verify/kafka-onos.yaml
@@ -13,12 +13,6 @@
           branch-regexp: '^((?!kafka-onos-1\..).*)$'
           junit-allow-empty-results: true
 
-      - 'kafka-onos-jobs-legacy':
-          branch-regexp: '^(kafka-onos-1.1|kafka-onos-1.2)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-          junit-allow-empty-results: true
-
 - job-group:
     name: 'kafka-onos-jobs-common'
     jobs:
@@ -30,10 +24,4 @@
       - 'maven-test'
       - 'maven-publish'
 
-- job-group:
-    name: 'kafka-onos-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
 # [EOF]
diff --git a/jjb/verify/kafka-robot.yaml b/jjb/verify/kafka-robot.yaml
deleted file mode 100644
index 7a7e61b..0000000
--- a/jjb/verify/kafka-robot.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'kafka-robot' repo
-
-- project:
-    name: kafka-robot
-    project: '{name}'
-
-    jobs:
-      - 'verify-kafka-robot-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-kafka-robot-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-          pypi-index: 'pypi'
-
-- job-group:
-    name: 'verify-kafka-robot-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-kafka-robot-jobs'
-    jobs:
-      - 'pypi-publish':
-          project-regexp: '^{name}$'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/kafka-topic-exporter.yaml b/jjb/verify/kafka-topic-exporter.yaml
deleted file mode 100644
index 7ec7d1c..0000000
--- a/jjb/verify/kafka-topic-exporter.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'kafka-topic-exporter' repo
-
-- project:
-    name: kafka-topic-exporter
-    project: '{name}'
-
-    jobs:
-      - 'verify-kafka-topic-exporter-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-kafka-topic-exporter-jobs'
-
-- job-group:
-    name: 'verify-kafka-topic-exporter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-timeout: 30
-          unit-test-targets: 'test docker-build'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-kafka-topic-exporter-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/kafkaloghandler.yaml b/jjb/verify/kafkaloghandler.yaml
deleted file mode 100644
index 52c5e84..0000000
--- a/jjb/verify/kafkaloghandler.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'kafkaloghandler' repo
-
-- project:
-    name: kafkaloghandler
-    project: '{name}'
-
-    jobs:
-      - 'verify-kafkaloghandler-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-kafkaloghandler-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'python-unit-test':
-          dependency-jobs: 'verify_kafkaloghandler_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/kubernetes-service.yaml b/jjb/verify/kubernetes-service.yaml
deleted file mode 100644
index 2a0d2e8..0000000
--- a/jjb/verify/kubernetes-service.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'kubernetes-service' repo
-
-- project:
-    name: kubernetes-service
-    project: '{name}'
-
-    jobs:
-      - 'verify-kubernetes-service-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-kubernetes-service-jobs'
-
-- job-group:
-    name: 'verify-kubernetes-service-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_kubernetes-service_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_kubernetes-service-unit-test'
-
-- job-group:
-    name: 'publish-kubernetes-service-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "scottb@opennetworking.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/maas.yaml b/jjb/verify/maas.yaml
deleted file mode 100644
index d01cbfd..0000000
--- a/jjb/verify/maas.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'maas' repo
-
-- project:
-    name: maas
-    project: '{name}'
-
-    jobs:
-      - 'verify-maas-jobs':
-          branch-regexp: '{legacy-branches-regexp}'
-
-- job-group:
-    name: 'verify-maas-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'verify-ansible-lint':
-          dependency-jobs: 'verify_maas_licensed'
-
-# [EOF]
diff --git a/jjb/verify/manifest.yaml b/jjb/verify/manifest.yaml
deleted file mode 100644
index f76b2bf..0000000
--- a/jjb/verify/manifest.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'manifest' repo
-
-- project:
-    name: manifest
-    project: '{name}'
-
-    jobs:
-      - 'verify-manifest-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-manifest-jobs'
-    jobs:
-      - 'verify-repo-manifest'
-
-
-# [EOF]
diff --git a/jjb/verify/mcast.yaml b/jjb/verify/mcast.yaml
index 5735ba7..a6bebf5 100644
--- a/jjb/verify/mcast.yaml
+++ b/jjb/verify/mcast.yaml
@@ -13,12 +13,6 @@
           branch-regexp: '^((?!mcast-1\.4).*)$'
           junit-allow-empty-results: true
 
-      - 'mcast-jobs-legacy':
-          branch-regexp: '^(mcast-1.4)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-          junit-allow-empty-results: true
-
 - job-group:
     name: 'mcast-jobs-common'
     jobs:
@@ -30,10 +24,4 @@
       - 'maven-test'
       - 'maven-publish'
 
-- job-group:
-    name: 'mcast-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
 # [EOF]
diff --git a/jjb/verify/mcord.yaml b/jjb/verify/mcord.yaml
deleted file mode 100644
index f356f41..0000000
--- a/jjb/verify/mcord.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'mcord' repo
-
-- project:
-    name: mcord
-    project: '{name}'
-
-    jobs:
-      - 'verify-mcord-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-mcord-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'verify-ansible-lint':
-          dependency-jobs: 'verify_mcord_licensed'
-
-# [EOF]
diff --git a/jjb/verify/mgmt-gateway-vm.yaml b/jjb/verify/mgmt-gateway-vm.yaml
deleted file mode 100644
index 94115a8..0000000
--- a/jjb/verify/mgmt-gateway-vm.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'mgmt-gateway-vm' repo
-
-- project:
-    name: mgmt-gateway-vm
-    project: '{name}'
-
-    jobs:
-      - 'verify-mgmt-gateway-vm-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-mgmt-gateway-vm-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/mn-stratum-siab.yaml b/jjb/verify/mn-stratum-siab.yaml
deleted file mode 100644
index eb6356f..0000000
--- a/jjb/verify/mn-stratum-siab.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'mn-stratum-siab' repo
-
-- project:
-    name: mn-stratum-siab
-    project: '{name}'
-
-    jobs:
-      - 'verify-mn-stratum-siab-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-mn-stratum-siab-jobs'
-
-- job-group:
-    name: 'verify-mn-stratum-siab-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'test'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-mn-stratum-siab-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-
-# [EOF]
diff --git a/jjb/verify/multifabric.yaml b/jjb/verify/multifabric.yaml
deleted file mode 100644
index af6c400..0000000
--- a/jjb/verify/multifabric.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# verification jobs for 'multifabric' repo
-
-- project:
-    name: multifabric
-    project: '{name}'
-
-    jobs:
-      - 'verify-multifabric-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-multifabric-jobs'
-
-- job-group:
-    name: 'verify-multifabric-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'test docker-build'
-          junit-allow-empty-results: true
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_multifabric_unit-test'
-
-- job-group:
-    name: 'publish-multifabric-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "hyunsun@opennetworking.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/multistructlog.yaml b/jjb/verify/multistructlog.yaml
deleted file mode 100644
index db4358d..0000000
--- a/jjb/verify/multistructlog.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'multistructlog' repo
-
-- project:
-    name: multistructlog
-    project: '{name}'
-
-    jobs:
-      - 'verify-multistructlog-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-multistructlog-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'python-unit-test':
-          dependency-jobs: 'verify_multistructlog_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/nem-ondemand-proxy.yaml b/jjb/verify/nem-ondemand-proxy.yaml
deleted file mode 100644
index 27a301a..0000000
--- a/jjb/verify/nem-ondemand-proxy.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# verification jobs for 'nem-ondemand-proxy' repo
-
-- project:
-    name: nem-ondemand-proxy
-    project: '{name}'
-
-    jobs:
-      - 'verify-nem-ondemand-proxy-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-nem-ondemand-proxy-jobs'
-
-- job-group:
-    name: 'verify-nem-ondemand-proxy-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'docker-build lint'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-nem-ondemand-proxy-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/ntt-workflow-driver.yaml b/jjb/verify/ntt-workflow-driver.yaml
deleted file mode 100644
index 9f69dbe..0000000
--- a/jjb/verify/ntt-workflow-driver.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'ntt-workflow-driver' repo
-
-- project:
-    name: ntt-workflow-driver
-    project: '{name}'
-
-    jobs:
-      - 'verify-ntt-workflow-driver-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-ntt-workflow-driver-jobs'
-
-- job-group:
-    name: 'verify-ntt-workflow-driver-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_ntt-workflow-driver_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_ntt-workflow-driver-unit-test'
-
-- job-group:
-    name: 'publish-ntt-workflow-driver-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 52974d4..1021367 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -14,10 +14,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '{kind-voltha-regexp}'
-      - 'verify-ofagent-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '{kind-voltha-regexp}'
       - 'verify-ofagent-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
deleted file mode 100644
index 60ef0da..0000000
--- a/jjb/verify/olt-service.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'olt-service' repo
-
-- project:
-    name: olt-service
-    project: '{name}'
-
-    jobs:
-      - 'verify-olt-service-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-olt-service-jobs'
-
-- job-group:
-    name: 'verify-olt-service-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_olt-service_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_olt-service-unit-test'
-- job-group:
-    name: 'publish-olt-service-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/olt.yaml b/jjb/verify/olt.yaml
index 74c023c..841814e 100644
--- a/jjb/verify/olt.yaml
+++ b/jjb/verify/olt.yaml
@@ -12,11 +12,6 @@
       - 'olt-jobs':
           branch-regexp: '^((?!olt-3\.0).*)$'
 
-      - 'olt-jobs-legacy':
-          branch-regexp: '^(olt-3.0)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-
 - job-group:
     name: 'olt-jobs-common'
     jobs:
@@ -28,10 +23,4 @@
       - 'maven-test'
       - 'maven-publish'
 
-- job-group:
-    name: 'olt-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
 # [EOF]
diff --git a/jjb/verify/olttopology.yaml b/jjb/verify/olttopology.yaml
deleted file mode 100644
index fef489e..0000000
--- a/jjb/verify/olttopology.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# jobs for 'olttopology' repo
-
-- project:
-    name: olttopology
-    project: '{name}'
-
-    jobs:
-      - 'olttopology-jobs':
-          branch-regexp: '^(.*)$'
-
-- job-group:
-    name: 'olttopology-jobs-common'
-    jobs:
-      - 'verify-licensed'
-
-- job-group:
-    name: 'olttopology-jobs'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-# [EOF]
diff --git a/jjb/verify/omci-lib-go.yaml b/jjb/verify/omci-lib-go.yaml
deleted file mode 100644
index 3b8a8f2..0000000
--- a/jjb/verify/omci-lib-go.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'omci-lib-go' repo
-
-- project:
-    name: omci-lib-go
-    project: '{name}'
-
-    jobs:
-      - 'verify-omci-lib-go-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-omci-lib-go-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test'
-
-# [EOF]
diff --git a/jjb/verify/omec-cni.yaml b/jjb/verify/omec-cni.yaml
deleted file mode 100644
index 5db70ec..0000000
--- a/jjb/verify/omec-cni.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'omec-cni' repo
-
-- project:
-    name: omec-cni
-    project: '{name}'
-
-    jobs:
-      - 'verify-omec-cni-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-omec-cni-jobs'
-
-- job-group:
-    name: 'verify-omec-cni-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-timeout: 30
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-omec-cni-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'omecproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/omec-pod-init.yaml b/jjb/verify/omec-pod-init.yaml
deleted file mode 100644
index 81ad208..0000000
--- a/jjb/verify/omec-pod-init.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'omec-pod-init' repo
-
-- project:
-    name: omec-pod-init
-    project: '{name}'
-
-    jobs:
-      - 'verify-omec-pod-init-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-omec-pod-init-jobs'
-
-- job-group:
-    name: 'verify-omec-pod-init-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-timeout: 30
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-omec-pod-init-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'omecproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/onos-classic-helm-utils.yaml b/jjb/verify/onos-classic-helm-utils.yaml
deleted file mode 100644
index 341f226..0000000
--- a/jjb/verify/onos-classic-helm-utils.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'onos-classic-helm-utils' repo
-
-- project:
-    name: onos-classic-helm-utils
-    project: '{name}'
-
-    jobs:
-      - 'verify-onos-classic-helm-utils-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-onos-classic-helm-utils-jobs'
-
-- job-group:
-    name: 'verify-onos-classic-helm-utils-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-timeout: 30
-          unit-test-targets: 'docker-build'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-onos-classic-helm-utils-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'opencord'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
deleted file mode 100644
index 228d078..0000000
--- a/jjb/verify/onos-service.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'onos-service' repo
-
-- project:
-    name: onos-service
-    project: '{name}'
-
-    jobs:
-      - 'verify-onos-service-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-onos-service-jobs'
-
-- job-group:
-    name: 'verify-onos-service-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_onos-service_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_onos-service-unit-test'
-
-- job-group:
-    name: 'publish-onos-service-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/openairinterface.yaml b/jjb/verify/openairinterface.yaml
deleted file mode 100644
index 8eec392..0000000
--- a/jjb/verify/openairinterface.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'openairinterface' repo
-
-- project:
-    name: openairinterface
-    project: '{name}'
-
-    jobs:
-      - 'verify-openairinterface-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-openairinterface-jobs'
-
-- job-group:
-    name: 'verify-openairinterface-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-timeout: 60
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-openairinterface-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 60
-          docker-repo: 'omecproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/opendevice-manager.yaml b/jjb/verify/opendevice-manager.yaml
deleted file mode 100644
index 008118e..0000000
--- a/jjb/verify/opendevice-manager.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# verification jobs for 'opendevice-manager' repo
-
-- project:
-    name: opendevice-manager
-    project: '{name}'
-
-    jobs:
-      - 'verify-opendevice-manager-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-opendevice-manager-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-opendevice-manager-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
-          unit-test-targets: 'test'
-          # opendm-agent uses gtest which outputs in xunit format
-          junit-allow-empty-results: true
-          xunit-skip-if-no-test-files: false
-
-- job-group:
-    name: 'publish-voltha-opendevice-manager-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/opendm-agent.yaml b/jjb/verify/opendm-agent.yaml
deleted file mode 100644
index d89306c..0000000
--- a/jjb/verify/opendm-agent.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# verification jobs for 'opendm-agent' repo
-
-- project:
-    name: opendm-agent
-    project: '{name}'
-
-    jobs:
-      - 'verify-opendm-agent-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-opendm-agent-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
-          unit-test-targets: 'test'
-          # opendm-agent uses gtest which outputs in xunit format
-          junit-allow-empty-results: true
-          xunit-skip-if-no-test-files: false
-
-# [EOF]
diff --git a/jjb/verify/openolt-scale-tester.yaml b/jjb/verify/openolt-scale-tester.yaml
deleted file mode 100644
index 34a0389..0000000
--- a/jjb/verify/openolt-scale-tester.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'openolt-scale-tester' repo
-
-- project:
-    name: openolt-scale-tester
-    project: '{name}'
-
-    jobs:
-      - 'verify-openolt-scale-tester-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-openolt-scale-tester-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-openolt-scale-tester-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dest-gopath: "github.com/opencord"
-          unit-test-targets: 'test'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-openolt-scale-tester-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/openolt-test.yaml b/jjb/verify/openolt-test.yaml
deleted file mode 100644
index 8c053a7..0000000
--- a/jjb/verify/openolt-test.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# verification jobs for 'openolt-test' repo
-
-- project:
-    name: openolt-test
-    project: '{name}'
-
-    jobs:
-      - 'verify-openolt-test-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-openolt-test-jobs'
-
-- job-group:
-    name: 'verify-openolt-test-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
-          build-timeout: 60
-          unit-test-targets: 'lint docker-build'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-openolt-test-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 60
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/openstack.yaml b/jjb/verify/openstack.yaml
deleted file mode 100644
index cdb2e86..0000000
--- a/jjb/verify/openstack.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'openstack' repo
-
-- project:
-    name: openstack
-    project: '{name}'
-
-    jobs:
-      - 'verify-openstack-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-openstack-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_openstack_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/osam.yaml b/jjb/verify/osam.yaml
deleted file mode 100644
index a477cff..0000000
--- a/jjb/verify/osam.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
----
-# verification jobs for 'osam' repo
-
-- project:
-    name: osam
-    project: '{name}'
-
-    jobs:
-      - 'verify-osam-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-osam-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'osam-test':
-          dependency-jobs: 'verify_osam_licensed'
-
-- job-template:
-    id: 'osam-test'
-    name: 'verify_{project}_test'
-
-    description: |
-      Created by {id} job-template from ci-management/jjb/verify/osam.yaml
-
-    triggers:
-      - cord-infra-gerrit-trigger-patchset:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^{project}$'
-          branch-regexp: '{branch-regexp}'
-          dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{all-files-regexp}'
-
-    properties:
-      - 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: 40
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    scm:
-      - cord-infra-gerrit-scm:
-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
-          choosing-strategy: 'gerrit'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          basedir: '{basedir}'
-
-    node: 'ubuntu18.04-basebuild-1c-2g'
-    project-type: freestyle
-    concurrent: true
-
-    builders:
-      # NOTE: this env var is only required to fix a bug in the "surefire"
-      #  dependency:
-      #    https://issues.apache.org/jira/browse/SUREFIRE-1588
-      #    https://github.com/apache/maven-surefire/pull/197
-      #    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
-      # should be removed as soon as this problem is resolved
-      - inject:
-          properties-content: |
-            _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
-
-      - shell: |
-          #!/usr/bin/env bash
-          set -eux -o pipefail
-
-          echo "Starting database for OSAM tests"
-
-          # pull database
-          docker pull mariadb:10.3-bionic
-
-          # run database
-          # Settings for the following commmand must match values given
-          # in: osam-core/model/src/main/resources/application.properties
-
-          docker run -d -p 3306:3306 --name springbootdb \
-                     -e MYSQL_DATABASE=osam_core \
-                     -e MYSQL_USER=root \
-                     -e MYSQL_ROOT_PASSWORD=123456 \
-                     mariadb:10.3-bionic
-
-          # wait for mariadb to start up, print docker container status
-          sleep 15
-          docker ps -a
-
-      - maven-target:
-          goals: "test"
-          pom: "pom.xml"
-          maven-version: '{maven-version}'
-
-    publishers:
-      - postbuildscript:
-          builders:
-            - build-on:
-                - SUCCESS
-                - UNSTABLE
-                - FAILURE
-              build-steps:
-                - shell: |
-                    #!/usr/bin/env bash
-                    set -eux -o pipefail
-
-                    echo "Stopping database"
-                    docker ps -a
-                    docker rm -f springbootdb
-
-
-# [EOF]
diff --git a/jjb/verify/platform-install.yaml b/jjb/verify/platform-install.yaml
deleted file mode 100644
index 36befe4..0000000
--- a/jjb/verify/platform-install.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'platform-install' repo
-
-- project:
-    name: platform-install
-    project: '{name}'
-
-    jobs:
-      - 'verify-platform-install-jobs':
-          branch-regexp: '{legacy-branches-regexp}'
-
-- job-group:
-    name: 'verify-platform-install-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'verify-ansible-lint':
-          dependency-jobs: 'verify_platform-install_licensed'
-
-# [EOF]
diff --git a/jjb/verify/plyxproto.yaml b/jjb/verify/plyxproto.yaml
deleted file mode 100644
index a419d90..0000000
--- a/jjb/verify/plyxproto.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# verification jobs for 'plyxproto' repo
-
-- project:
-    name: plyxproto
-    project: '{name}'
-
-    jobs:
-      - 'verify-plyxproto-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'post-merge-plyxproto-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-          pypi-index: 'pypi'
-
-- job-group:
-    name: 'verify-plyxproto-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'python-unit-test':
-
-- job-group:
-    name: 'post-merge-plyxproto-jobs'
-    jobs:
-      - 'pypi-publish':
-          project-regexp: '^{name}$'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/pppoel2relay.yaml b/jjb/verify/pppoel2relay.yaml
deleted file mode 100644
index 8c4dfe3..0000000
--- a/jjb/verify/pppoel2relay.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# jobs for 'pppoel2relay' repo
-
-- project:
-    name: pppoel2relay
-    project: '{name}'
-
-    jobs:
-      - 'pppoel2relay-jobs':
-          branch-regexp: '^(.*)$'
-
-- job-group:
-    name: 'pppoel2relay-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'maven-test'
-      - 'maven-publish'
-
-# [EOF]
diff --git a/jjb/verify/progran.yaml b/jjb/verify/progran.yaml
deleted file mode 100644
index c3297bb..0000000
--- a/jjb/verify/progran.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'progran' repo
-
-- project:
-    name: progran
-    project: '{name}'
-
-    jobs:
-      - 'verify-progran-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-progran-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/qa-manifest.yaml b/jjb/verify/qa-manifest.yaml
deleted file mode 100644
index 0028133..0000000
--- a/jjb/verify/qa-manifest.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'qa-manifest' repo
-
-- project:
-    name: qa-manifest
-    project: '{name}'
-
-    jobs:
-      - 'verify-qa-manifest-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-qa-manifest-jobs'
-    jobs:
-      - 'verify-repo-manifest'
-
-
-# [EOF]
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
deleted file mode 100644
index cc40715..0000000
--- a/jjb/verify/rcord.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'rcord' repo
-
-- project:
-    name: rcord
-    project: '{name}'
-
-    jobs:
-      - 'verify-rcord-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-rcord-jobs'
-
-- job-group:
-    name: 'verify-rcord-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_rcord_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_rcord-unit-test'
-
-- job-group:
-    name: 'publish-rcord-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/sadis-server.yaml b/jjb/verify/sadis-server.yaml
deleted file mode 100644
index bfa7b6e..0000000
--- a/jjb/verify/sadis-server.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
----
-# verification jobs for 'sadis-server' repo
-
-- project:
-    name: sadis-server
-    project: '{name}'
-
-    jobs:
-      - 'verify-sadis-server-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-sadis-server-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'sadis-server-tests':
-          dependency-jobs: 'verify_sadis-server_tag-collision'
-
-- job-template:
-    id: 'sadis-server-tests'
-    name: 'verify_{project}_tests'
-
-    description: |
-      Created by {id} job-template from ci-management/jjb/verify/sadis-server.yaml
-
-    triggers:
-      - cord-infra-gerrit-trigger-patchset:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^{project}$'
-          branch-regexp: '{branch-regexp}'
-          dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{all-files-regexp}'
-
-    properties:
-      - 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: 20
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    scm:
-      - cord-infra-gerrit-scm:
-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
-          choosing-strategy: 'gerrit'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          basedir: '{project}'
-
-    node: 'ubuntu18.04-basebuild-1c-2g'
-    project-type: freestyle
-    concurrent: true
-
-    builders:
-      - shell: |
-          #!/usr/bin/env bash
-          set -eux -o pipefail
-
-          export GOPATH=~/go
-          export PATH=$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:~/go/bin
-
-          # move code the proper location
-          mkdir -p $GOPATH/src/gerrit.opencord.org
-          mv sadis-server $GOPATH/src/gerrit.opencord.org/sadis-server
-
-          pushd $GOPATH/src/gerrit.opencord.org/sadis-server
-
-          dep ensure -v -update
-
-          go build -v
-
-          go test -v ./...
-
-          # generate Jenkins report
-          go test -v ./...  2>&1 | go-junit-report > $WORKSPACE/junit-report.xml
-
-          # generate Jenkins coverage
-          go test -coverprofile=coverage.txt -covermode=count ./...
-          gocover-cobertura < coverage.txt > $WORKSPACE/coverage.xml
-
-          popd
-
-
-    publishers:
-      - junit:
-          results: "junit-report.xml"
-          allow-empty-results: true
-      - cobertura:
-          report-file: "coverage.xml"
-          targets:
-            - files:
-                healthy: 80
-                unhealthy: 0
-                failing: 0
-            - method:
-                healthy: 50
-                unhealthy: 0
-                failing: 0
-
-# [EOF]
diff --git a/jjb/verify/sadis.yaml b/jjb/verify/sadis.yaml
index f9ee810..178c3b3 100644
--- a/jjb/verify/sadis.yaml
+++ b/jjb/verify/sadis.yaml
@@ -12,11 +12,6 @@
       - 'sadis-jobs':
           branch-regexp: '^((?!sadis-3\.1).*)$'
 
-      - 'sadis-jobs-legacy':
-          branch-regexp: '^(sadis-3.1)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-
 - job-group:
     name: 'sadis-jobs-common'
     jobs:
@@ -28,10 +23,4 @@
       - 'maven-test'
       - 'maven-publish'
 
-- job-group:
-    name: 'sadis-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
 # [EOF]
diff --git a/jjb/verify/sdn-controller.yaml b/jjb/verify/sdn-controller.yaml
deleted file mode 100644
index e2838f2..0000000
--- a/jjb/verify/sdn-controller.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'sdn-controller' repo
-
-- project:
-    name: sdn-controller
-    project: '{name}'
-
-    jobs:
-      - 'verify-sdn-controller-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-sdn-controller-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/seba-manifest.yaml b/jjb/verify/seba-manifest.yaml
deleted file mode 100644
index 70d417c..0000000
--- a/jjb/verify/seba-manifest.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'seba-manifest' repo
-
-- project:
-    name: seba-manifest
-    project: '{name}'
-
-    jobs:
-      - 'verify-seba-manifest-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-seba-manifest-jobs'
-    jobs:
-      - 'verify-repo-manifest'
-
-
-# [EOF]
diff --git a/jjb/verify/seba.yaml b/jjb/verify/seba.yaml
deleted file mode 100644
index d8e9fee..0000000
--- a/jjb/verify/seba.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'seba' repo
-
-- project:
-    name: seba
-    project: '{name}'
-
-    jobs:
-      - 'verify-seba-jobs':
-          branch-regexp: '{seba-branches-regexp}'
-
-- job-group:
-    name: 'verify-seba-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/simpleexampleservice.yaml b/jjb/verify/simpleexampleservice.yaml
deleted file mode 100644
index 2a195c0..0000000
--- a/jjb/verify/simpleexampleservice.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'simpleexampleservice' repo
-
-- project:
-    name: simpleexampleservice
-    project: '{name}'
-
-    jobs:
-      - 'verify-simpleexampleservice-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-simpleexampleservice-jobs'
-
-- job-group:
-    name: 'verify-simpleexampleservice-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_simpleexampleservice_tag-collision'
-      - 'xos-service-upgrade':
-          dependency-jobs: 'verify_simpleexampleservice-unit-test'
-
-- job-group:
-    name: 'publish-simpleexampleservice-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "scottb@opennetworking.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
deleted file mode 100644
index cd0325a..0000000
--- a/jjb/verify/tt-workflow-driver.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# verification jobs for 'tt-workflow-driver' repo
-
-- project:
-    name: tt-workflow-driver
-    project: '{name}'
-
-    jobs:
-      - 'verify-tt-workflow-driver-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-tt-workflow-driver-jobs'
-
-- job-group:
-    name: 'verify-tt-workflow-driver-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_tt-workflow-driver_tag-collision'
-
-- job-group:
-    name: 'publish-tt-workflow-driver-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org, andy@opennetworking.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/up4.yaml b/jjb/verify/up4.yaml
deleted file mode 100644
index cd8886d..0000000
--- a/jjb/verify/up4.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
----
-# jobs for https://github.com/omec-project/up4
-
-- project:
-    name: up4
-    project: "{name}"
-    github-organization: "omec-project"
-    github_pr_auth_id: "64fe2b1a-b33a-4f13-8442-ad8360434003"
-    github_pr_org_list:
-      - "omec-project"
-
-    # Matrix
-    up4Ctrl:
-      - pfcp
-      - p4rt
-
-    jobs:
-      - "up4-jobs":
-          stream: "master"
-          # As we run integration tests with 3 ONOS instances,
-          # we need a beefy node.
-          build-node: "ubuntu18.04-basebuild-8c-15g"
-
-- job-group:
-    name: "up4-jobs"
-    jobs:
-      - "up4-pr-verify-{up4Ctrl}"
-      - "up4-postmerge-{up4Ctrl}"
-      - "up4-latest-nightly-{up4Ctrl}"
-
-- job-template:
-    id: "up4-pr-verify-{up4Ctrl}"
-    name: "up4-pr-verify-{up4Ctrl}"
-    description: |
-      Created by {id} job-template from ci-management/up4.yaml<br/>
-
-    project-type: pipeline
-    concurrent: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: "15"
-          artifact-num-to-keep: "-1"
-      - github:
-          url: "https://github.com/{github-organization}/{project}"
-
-    parameters:
-      - string:
-          name: buildNode
-          default: "{build-node}"
-          description: "Name of the Jenkins executor node to run the job on."
-      - string:
-          name: sha1
-          default: "origin/{stream}"
-          description: "SHA string of the pull request commit to build. Populated by GitHUb Pull Request Builder."
-      - string:
-          name: up4Ctrl
-          default: "{up4Ctrl}"
-          description: "Run p4rt or pfpc -based STC scenarios: [p4rt, pfcp]"
-
-    # Run pipeline that is checked-in in the same PR we want to verify.
-    pipeline-scm:
-      script-path: ".jenkins/Jenkinsfile"
-      scm:
-        - git:
-            url: "git@github.com:{github-organization}/{project}.git"
-            credentials-id: "github-onf-bot-ssh-key"
-            refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
-            branches:
-              - "$sha1"
-            submodule:
-              disable: true
-            shallow-clone: true
-
-    triggers:
-      - cord-infra-github-pr-trigger:
-          github_pr_org_list: "{obj:github_pr_org_list}"
-          github_pr_auth_id: "{github_pr_auth_id}"
-          status_context: "up4-pr-verify-{up4Ctrl}"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
-      - credentials-binding:
-          - text:
-              credential-id: codecov-up4
-              variable: CODECOV_TOKEN
-
-- job-template:
-    id: "up4-postmerge-{up4Ctrl}"
-    name: "up4-postmerge-{up4Ctrl}"
-    description: |
-      Created by {id} job-template from ci-management/up4.yaml<br/>
-
-    project-type: pipeline
-    concurrent: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: "15"
-          artifact-num-to-keep: "-1"
-      - github:
-          url: "https://github.com/{github-organization}/{project}"
-
-    parameters:
-      - string:
-          name: buildNode
-          default: "{build-node}"
-          description: "Name of the Jenkins executor node to run the job on."
-      - string:
-          name: commitHash
-          default: 'origin/{stream}'
-          description: 'SHA string of the merged commit to build. Populated by Generic Webhook Trigger.'
-      - string:
-          name: up4Ctrl
-          default: "{up4Ctrl}"
-          description: "Run p4rt or pfpc -based STC scenarios: [p4rt, pfcp]"
-
-    pipeline-scm:
-      script-path: ".jenkins/Jenkinsfile"
-      scm:
-        - git:
-            url: "git@github.com:{github-organization}/{project}.git"
-            credentials-id: "github-onf-bot-ssh-key"
-            refspec: "+refs/heads/*:refs/remotes/origin/*"
-            branches:
-              - "$commitHash"
-            submodule:
-              disable: true
-            shallow-clone: true
-
-    triggers:
-      - cord-infra-github-pr-trigger-merge:
-          project: '{project}'
-      - timed: "@midnight"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
-      - credentials-binding:
-          - text:
-              credential-id: codecov-up4
-              variable: CODECOV_TOKEN
-
-- job-template:
-    id: "up4-latest-nightly-{up4Ctrl}"
-    name: "up4-latest-nightly-{up4Ctrl}"
-    description: |
-      Created by {id} job-template from ci-management/up4.yaml<br/>
-
-    project-type: pipeline
-    concurrent: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: "15"
-          artifact-num-to-keep: "-1"
-      - github:
-          url: "https://github.com/{github-organization}/{project}"
-
-    parameters:
-      - string:
-          name: buildNode
-          default: "{build-node}"
-          description: "Name of the Jenkins executor node to run the job on."
-      - string:
-          name: commitHash
-          default: 'origin/{stream}'
-          description: 'SHA string of the merged commit to build. Populated by Generic Webhook Trigger.'
-      - string:
-          name: up4Env
-          default: 'latest'
-          description: 'UP4 STC scenarios environment (stable or latest)'
-      - string:
-          name: up4Ctrl
-          default: "{up4Ctrl}"
-          description: "Run p4rt or pfpc -based STC scenarios: [p4rt, pfcp]"
-
-    pipeline-scm:
-      script-path: ".jenkins/Jenkinsfile"
-      scm:
-        - git:
-            url: "git@github.com:{github-organization}/{project}.git"
-            credentials-id: "github-onf-bot-ssh-key"
-            refspec: "+refs/heads/*:refs/remotes/origin/*"
-            branches:
-              - "$commitHash"
-            submodule:
-              disable: true
-            shallow-clone: true
-
-    triggers:
-      - timed: "@midnight"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
-      - credentials-binding:
-          - text:
-              credential-id: codecov-up4
-              variable: CODECOV_TOKEN
-
-# [EOF]
diff --git a/jjb/verify/vEE.yaml b/jjb/verify/vEE.yaml
deleted file mode 100644
index bea359e..0000000
--- a/jjb/verify/vEE.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'vEE' repo
-
-- project:
-    name: vEE
-    project: '{name}'
-
-    jobs:
-      - 'verify-vEE-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vEE-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/vEG.yaml b/jjb/verify/vEG.yaml
deleted file mode 100644
index 3c863db..0000000
--- a/jjb/verify/vEG.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'vEG' repo
-
-- project:
-    name: vEG
-    project: '{name}'
-
-    jobs:
-      - 'verify-vEG-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vEG-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_vEG_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/vEPC.yaml b/jjb/verify/vEPC.yaml
deleted file mode 100644
index 12bf8a6..0000000
--- a/jjb/verify/vEPC.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'vEPC' repo
-
-- project:
-    name: vEPC
-    project: '{name}'
-
-    jobs:
-      - 'verify-vEPC-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vEPC-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/vHSS.yaml b/jjb/verify/vHSS.yaml
deleted file mode 100644
index 23bcca9..0000000
--- a/jjb/verify/vHSS.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'vHSS' repo
-
-- project:
-    name: vHSS
-    project: '{name}'
-
-    jobs:
-      - 'verify-vHSS-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vHSS-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/vMME.yaml b/jjb/verify/vMME.yaml
deleted file mode 100644
index 923a24a..0000000
--- a/jjb/verify/vMME.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'vMME' repo
-
-- project:
-    name: vMME
-    project: '{name}'
-
-    jobs:
-      - 'verify-vMME-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vMME-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/venb.yaml b/jjb/verify/venb.yaml
deleted file mode 100644
index 3f45669..0000000
--- a/jjb/verify/venb.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'venb' repo
-
-- project:
-    name: venb
-    project: '{name}'
-
-    jobs:
-      - 'verify-venb-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-venb-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/ves-agent.yaml b/jjb/verify/ves-agent.yaml
deleted file mode 100644
index 6448a72..0000000
--- a/jjb/verify/ves-agent.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# verification jobs for 'ves-agent' repo
-
-- project:
-    name: ves-agent
-    project: '{name}'
-
-    jobs:
-      - 'verify-ves-agent-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-ves-agent-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/vnaas.yaml b/jjb/verify/vnaas.yaml
deleted file mode 100644
index 93f7ce9..0000000
--- a/jjb/verify/vnaas.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# verification jobs for 'vnaas' repo
-
-- project:
-    name: vnaas
-    project: '{name}'
-
-    jobs:
-      - 'verify-vnaas-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vnaas-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_vnaas_tag-collision'
-#
-
-# [EOF]
diff --git a/jjb/verify/voltha-adtran-adapter.yaml b/jjb/verify/voltha-adtran-adapter.yaml
deleted file mode 100644
index 7896ebe..0000000
--- a/jjb/verify/voltha-adtran-adapter.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'voltha-adtran-adapter' repo
-
-- project:
-    name: voltha-adtran-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-adtran-adapter-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-adtran-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-#     - 'python-unit-test':
-#         dependency-jobs: 'verify_voltha-adtran-adapter_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
deleted file mode 100644
index 073745f..0000000
--- a/jjb/verify/voltha-api-server.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
----
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Entropy: 0fcb5ffa-d1a4-11ee-be5e-9f44b7181764
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'voltha-api-server' repo
-#   Note: voltha-api-server is unmaintained, should we keep running tests?
-# -----------------------------------------------------------------------
-
-- project:
-    name: voltha-api-server
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-api-server-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-api-server-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-# -----------------------------------------------------------------------
-# verify-voltha-api-server-jobs
-#   o explicitly dependent on v2.8
-#   o copied to job verify-voltha-api-server-jobs-voltha-2.8
-#   o updated verify-voltha-api-server-jobs to depend on v2.11
-#   o is this another element that should be deleted with v2.11 ?
-#   o if not deprecated rename job to contain *-voltha-x.y to be clear
-#     the job is not intended for master branch.
-# -----------------------------------------------------------------------
-- job-group:
-    name: 'verify-voltha-api-server-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
-          dest-gopath: "github.com/opencord"
-          unit-test-targets: 'lint sca test'
-          unit-test-keep-going: 'false'
-          junit-allow-empty-results: true
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.11'
-
-- job-group:
-    name: 'verify-voltha-api-server-jobs-voltha-2.8'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-2c-4g'
-          dest-gopath: "github.com/opencord"
-          unit-test-targets: 'lint sca test'
-          unit-test-keep-going: 'false'
-          junit-allow-empty-results: true
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.8'
-
-- job-group:
-    name: 'publish-voltha-api-server-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/voltha-eponolt-adapter.yaml b/jjb/verify/voltha-eponolt-adapter.yaml
deleted file mode 100644
index fb83ae4..0000000
--- a/jjb/verify/voltha-eponolt-adapter.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# verification jobs for 'voltha-eponolt-adapter' repo
-
-- project:
-    name: voltha-eponolt-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-eponolt-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-eponolt-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-eponolt-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          dest-gopath: "github.com/opencord"
-          unit-test-targets: 'lint sca test'
-          unit-test-keep-going: 'false'
-
-- job-group:
-    name: 'publish-voltha-eponolt-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag_wildcard'
-          extraEnvironmentVars: BUILD_PROFILED=true
-
-# [EOF]
diff --git a/jjb/verify/voltha-epononu-adapter.yaml b/jjb/verify/voltha-epononu-adapter.yaml
deleted file mode 100644
index 2700e07..0000000
--- a/jjb/verify/voltha-epononu-adapter.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'voltha-epononu-adapter' repo
-
-- project:
-    name: voltha-epononu-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-epononu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-epononu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-epononu-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'test'
-          unit-test-keep-going: 'false'
-
-- job-group:
-    name: 'publish-voltha-epononu-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 41c6ff3..6360dbd 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -14,10 +14,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - 'verify-voltha-go-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-go-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
@@ -53,13 +49,6 @@
           pipeline-branch: 'voltha-2.13'
 
 - job-group:
-    name: 'verify-voltha-go-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-
-- job-group:
     name: 'verify-voltha-go-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
deleted file mode 100644
index 6c994e9..0000000
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-# verification jobs for 'voltha-northbound-bbf-adapter' repo
-
-- project:
-    name: voltha-northbound-bbf-adapter
-    project: '{name}'
-
-    jobs:
-      - 'voltha-northbound-bbf-adapter':
-          branch-regexp: '{all-branches-regexp}'
-      # - 'voltha-northbound-bbf-adapter-master':
-      #     branch-regexp: '^master$'
-      - 'publish-voltha-northbound-bbf-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'voltha-northbound-bbf-adapter'
-    jobs:
-      - 'verify-licensed'
-      - 'make-unit-test':
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
-          dest-gopath: "github.com/opencord"
-          unit-test-targets: 'lint sca test'
-          unit-test-keep-going: 'false'
-
-# NOTE add once we have sanity jobs for voltha-northbound-bbf-adapter
-# - job-group:
-#     name: 'voltha-northbound-bbf-adapter-master'
-#     jobs:
-#       - 'voltha-patch-test':
-#           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
-#           testTargets: |
-#             - target: sanity-voltha-northbound-bbf-adapter-att
-#               workflow: att
-#               flags: ""
-#               teardown: true
-#               logging: true
-#             - target: sanity-voltha-northbound-bbf-adapter-dt
-#               workflow: dt
-#               flags: ""
-#               teardown: true
-#               logging: true
-#             - target: sanity-voltha-northbound-bbf-adapter-tt
-#               workflow: tt
-#               flags: ""
-#               teardown: true
-#               logging: true
-
-- job-group:
-    name: 'publish-voltha-northbound-bbf-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index e82eb97..b7124b4 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -14,10 +14,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - 'verify-voltha-onos-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-onos-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
@@ -38,13 +34,6 @@
           pipeline-branch: 'voltha-2.13'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-
-- job-group:
     name: 'verify-voltha-onos-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 35ed232..6e43577 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -14,10 +14,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - '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}'
 
@@ -55,13 +51,6 @@
           pipeline-branch: 'master'
 
 - job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'master'
-
-- job-group:
     name: 'publish-voltha-openolt-adapter-jobs'
     jobs:
       - 'docker-publish':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 31425df..83b96f9 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -14,10 +14,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12':
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
@@ -52,13 +48,6 @@
           pipeline-branch: 'voltha-2.13'
 
 - job-group:
-    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-
-- job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 8972e0a..a45c619 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -22,11 +22,6 @@
           name-extension: '-voltha-2.13'
           override-branch: 'voltha-2.13'
           branch-regexp: '^voltha-2.13$'
-      - 'verify-voltha-system-tests-jobs-voltha-2.12':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          name-extension: '-voltha-2.12'
-          override-branch: 'voltha-2.12'
-          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-system-tests-jobs-voltha-2.11':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           name-extension: '-voltha-2.11'
@@ -57,13 +52,6 @@
           pipeline-branch: 'voltha-2.13'
 
 - job-group:
-    name: 'verify-voltha-system-tests-jobs-voltha-2.12'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-
-- job-group:
     name: 'verify-voltha-system-tests-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-test-manifest.yaml b/jjb/verify/voltha-test-manifest.yaml
deleted file mode 100644
index 85f6981..0000000
--- a/jjb/verify/voltha-test-manifest.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'voltha-test-manifest' repo
-
-- project:
-    name: voltha-test-manifest
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-test-manifest-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-test-manifest-jobs'
-    jobs:
-      - 'verify-repo-manifest'
-
-
-# [EOF]
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
deleted file mode 100644
index d70d0c0..0000000
--- a/jjb/verify/vrouter.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# verification jobs for 'vrouter' repo
-
-- project:
-    name: vrouter
-    project: '{name}'
-
-    jobs:
-      - 'verify-vrouter-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-vrouter-jobs'
-
-- job-group:
-    name: 'verify-vrouter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_vrouter_tag-collision'
-
-- job-group:
-    name: 'publish-vrouter-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/vsg-hw.yaml b/jjb/verify/vsg-hw.yaml
deleted file mode 100644
index 669ec11..0000000
--- a/jjb/verify/vsg-hw.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'vsg-hw' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: vsg-hw
-    project: '{name}'
-
-    jobs:
-      - 'verify-vsg-hw-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vsg-hw-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_vsg-hw_tag-collision'
-
-
-# [EOF]
diff --git a/jjb/verify/vsg.yaml b/jjb/verify/vsg.yaml
deleted file mode 100644
index 4179d21..0000000
--- a/jjb/verify/vsg.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'vsg' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: vsg
-    project: '{name}'
-
-    jobs:
-      - 'verify-vsg-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vsg-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-unit-test':
-          dependency-jobs: 'verify_vsg_tag-collision'
-
-# [EOF]
diff --git a/jjb/verify/vspgwc.yaml b/jjb/verify/vspgwc.yaml
deleted file mode 100644
index 05049ed..0000000
--- a/jjb/verify/vspgwc.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'vspgwc' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: vspgwc
-    project: '{name}'
-
-    jobs:
-      - 'verify-vspgwc-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vspgwc-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/vspgwu.yaml b/jjb/verify/vspgwu.yaml
deleted file mode 100644
index fb6771d..0000000
--- a/jjb/verify/vspgwu.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'vspgwu' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: vspgwu
-    project: '{name}'
-
-    jobs:
-      - 'verify-vspgwu-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vspgwu-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/vtn-service.yaml b/jjb/verify/vtn-service.yaml
deleted file mode 100644
index 54effe4..0000000
--- a/jjb/verify/vtn-service.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'vtn' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: vtn-service
-    project: '{name}'
-
-    jobs:
-      - 'verify-vtn-service-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vtn-service-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/vtn.yaml b/jjb/verify/vtn.yaml
deleted file mode 100644
index 1df4bda..0000000
--- a/jjb/verify/vtn.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: jobs for 'vtn' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: vtn
-    project: '{name}'
-
-    jobs:
-      - 'vtn-jobs-common':
-          branch-regexp: '^(.*)$'
-
-      - 'vtn-jobs':
-          branch-regexp: '^(master)$'
-
-      - 'vtn-jobs-legacy':
-          branch-regexp: '^(vtn-1.7)$'
-          jdk-distribution: 'java-1.8.0-amazon-corretto'
-          name-extension: '-jdk8'
-
-- job-group:
-    name: 'vtn-jobs-common'
-    jobs:
-      - 'verify-licensed'
-
-- job-group:
-    name: 'vtn-jobs'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-- job-group:
-    name: 'vtn-jobs-legacy'
-    jobs:
-      - 'maven-test'
-      - 'maven-publish'
-
-
-# [EOF]
diff --git a/jjb/verify/vtr.yaml b/jjb/verify/vtr.yaml
deleted file mode 100644
index fd69ce2..0000000
--- a/jjb/verify/vtr.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'vtr' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: vtr
-    project: '{name}'
-
-    jobs:
-      - 'verify-vtr-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-vtr-jobs'
-    jobs:
-      - 'verify-licensed'
-
-# [EOF]
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
deleted file mode 100644
index 54ecd4b..0000000
--- a/jjb/verify/xos-gui.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'xos-gui' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: xos-gui
-    project: '{name}'
-
-    jobs:
-      - 'verify-xos-gui-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-xos-gui-jobs'
-
-- job-group:
-    name: 'verify-xos-gui-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'gui-unit-test':
-          dependency-jobs: 'verify_xos-gui_tag-collision'
-
-- job-group:
-    name: 'publish-xos-gui-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
deleted file mode 100644
index 8754779..0000000
--- a/jjb/verify/xos-rest-gw.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'xos-rest-gw' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: xos-rest-gw
-    project: '{name}'
-
-    jobs:
-      - 'verify-xos-rest-gw-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-xos-rest-gw-jobs'
-
-- job-group:
-    name: 'verify-xos-rest-gw-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'xos-rest-gw-unit':
-          dependency-jobs: 'verify_xos-rest-gw_tag-collision'
-
-- job-group:
-    name: 'publish-xos-rest-gw-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
deleted file mode 100644
index 9d90822..0000000
--- a/jjb/verify/xos-tosca.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'xos-tosca' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: xos-tosca
-    project: '{name}'
-
-    jobs:
-      - 'verify-xos-tosca-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-xos-tosca-jobs'
-
-- job-group:
-    name: 'verify-xos-tosca-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'python-unit-test':
-          dependency-jobs: 'verify_xos-tosca_tag-collision'
-
-- job-group:
-    name: 'publish-xos-tosca-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org, scottb@opennetworking.org"
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
deleted file mode 100644
index 64d40bc..0000000
--- a/jjb/verify/xos.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-
-# -----------------------------------------------------------------------
-# Copyright 2018-2024 Open Networking Foundation Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2018-2024 Open Networking Foundation Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-# Intent: verification jobs for 'xos' repo
-# -----------------------------------------------------------------------
-
-- project:
-    name: xos
-    project: '{name}'
-
-    jobs:
-      - 'verify-xos-jobs-licensed-versioned':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'verify-xos-jobs-code':
-          branch-regexp: '{supported-branches-regexp}'
-      - 'publish-xos-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-# these two job groups are split so that documentation-only patches can go into
-# the XOS repo without invoking all the code-level tests.
-#
-# Items in the 'verify-xos-jobs-code' job-group only trigger with
-# 'non-doc-files-regexp', which excludes the docs/* and VERSION file
-
-- job-group:
-    name: 'verify-xos-jobs-licensed-versioned'
-    jobs:
-      - 'verify-licensed'
-
-- job-group:
-    name: 'verify-xos-jobs-code'
-    jobs:
-      - 'python-unit-test':
-          build-timeout: 45
-          # build-node: 'ubuntu18.04-basebuild-2c-4g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
-      - 'api-test':
-          pipeline-script: 'xos-core.groovy'
-
-- job-group:
-    name: 'publish-xos-jobs'
-    jobs:
-      - 'pypi-publish':
-          pypi-module-dirs: 'lib/xos-config|lib/xos-genx|lib/xos-util|lib/xos-api|lib/xos-migrate|lib/xos-synchronizer|lib/xos-kafka'
-          project-regexp: '^{name}$'
-          pypi-index: 'pypi'
-          dependency-jobs: 'version-tag_wildcard'
-      - 'docker-publish':
-          maintainers: "releng+voltha-build@linuxfoundation.org"
-          build-timeout: 30
-          docker-repo: 'xosproject'
-          dependency-jobs: 'version-tag_wildcard'
-
-# [EOF]
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 701dbe0..bbccdc9 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -590,36 +590,6 @@
               teardown: false
               logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multiple-olts-test-bbsim-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          olts: 2
-          extraHelmFlags: '--set onu=2,pon=2'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-multi-olt
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-multiolt-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-multiolt-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-multiolt-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
@@ -669,30 +639,6 @@
           timeout: 360
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-multi-uni-test-bbsim-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          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.11'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
@@ -742,32 +688,6 @@
               logging: true
           timeout: 180
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          olts: 2
-          extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-multiuni-multiolt-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-multiuni-multiolt-failurescenarios-att
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-multiuni-multiolt-errorscenarios-att
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-          timeout: 180
-
       # -----------------------------------------------------------------------
       # openonu Go periodic tests
       # -----------------------------------------------------------------------
@@ -990,116 +910,6 @@
               logging: true
           timeout: 240
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-openonu-go-test-bbsim-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          time-trigger: "H H/23 * * *"
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: mib-upload-templating-openonu-go-adapter-test
-              workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
-              workflow: tt
-              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-passed-test
-              workflow: att
-              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-failed-test
-              workflow: att
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: onu-mib-audit-test-single-kind-att
-              workflow: att
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
-              teardown: true
-              logging: true
-            - target: onu-mib-audit-test-single-kind-dt
-              workflow: dt
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
-              teardown: true
-              logging: true
-            - target: onu-mib-audit-test-single-kind-tt
-              workflow: tt
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
-              teardown: true
-              logging: true
-            - target: onu-robustness-test-single-kind-dt
-              workflow: dt
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
-              teardown: true
-              logging: true
-            - target: onu-robustness-test-multi-uni-kind-tt
-              workflow: tt
-              flags: "--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF,kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
-              teardown: true
-              logging: true
-          timeout: 240
-
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
@@ -1305,108 +1115,6 @@
               logging: true
           timeout: 210
 
-      - 'voltha-periodic-test':
-          name: 'patchset-voltha-2.12-openonu-go-test-bbsim'
-          trigger-comment: "voltha 2.12 test openonu singleolt"
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: '$GERRIT_BRANCH'
-          gerritProject: '$GERRIT_PROJECT'
-          gerritRefspec: '$GERRIT_REFSPEC'
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: mib-upload-templating-openonu-go-adapter-test
-              workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
-              workflow: tt
-              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-passed-test
-              workflow: att
-              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-failed-test
-              workflow: att
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: onu-mib-audit-test-single-kind-att
-              workflow: att
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
-              teardown: true
-              logging: true
-            - target: onu-mib-audit-test-single-kind-dt
-              workflow: dt
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
-              teardown: true
-              logging: true
-            - target: onu-mib-audit-test-single-kind-tt
-              workflow: tt
-              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
-              teardown: true
-              logging: true
-          timeout: 210
-
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
@@ -1551,78 +1259,6 @@
           time-trigger: "H H/23 * * *"
           timeout: 270
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          extraHelmFlags: '--set onu=2,pon=2'
-          olts: 2
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
-              workflow: tt
-              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-multiolt-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-multiolt-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-multiolt-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          time-trigger: "H H/23 * * *"
-          timeout: 270
-
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
@@ -1771,80 +1407,6 @@
               logging: true
           timeout: 270
 
-      - 'voltha-periodic-test':
-          name: 'patchset-voltha-2.12-multiple-olts-openonu-go-test-bbsim'
-          trigger-comment: "voltha 2.12 test openonu multiolt"
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: '$GERRIT_BRANCH'
-          gerritProject: '$GERRIT_PROJECT'
-          gerritRefspec: '$GERRIT_REFSPEC'
-          extraHelmFlags: '--set onu=2,pon=2'
-          olts: 2
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-multi-olt-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
-              workflow: tt
-              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-multiolt-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-multiolt-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-multiolt-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-multiolt-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          timeout: 270
-
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
@@ -1931,19 +1493,6 @@
               teardown: true
               logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-DMI-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: bbsim-dmi-hw-management-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
@@ -1974,21 +1523,6 @@
               teardown: true
               logging: true
 
-      - 'voltha-periodic-test':
-          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'
-          code-branch: 'voltha-2.12'
-          extraHelmFlags: '--set onu=2,pon=2'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: sanity-multi-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-periodic-test':
@@ -2015,34 +1549,6 @@
               teardown: true
               logging: true
 
-      # -----------------------------------------------------------------------
-      # -----------------------------------------------------------------------
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          extraHelmFlags: '--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
-          time-trigger: "H H/23 * * *"
-          logLevel: 'DEBUG'
-          robot-args: '-v unitag_sub:True'
-          testTargets: |
-            - target: functional-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-failurescenarios-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: functional-single-kind-multiuni-tt
-              workflow: tt
-              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
-              teardown: true
-              logging: true
-
       - 'voltha-periodic-test':
           name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.11'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
@@ -2102,25 +1608,6 @@
               logging: true
           timeout: 230
 
-      # -----------------------------------------------------------------------
-      # -----------------------------------------------------------------------
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-memory-leak-test-bbsim-2.12'
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          time-trigger: "H H/23 * * *"
-          withMonitoring: true
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: memory-leak-test-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-          timeout: 230
-
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
diff --git a/jjb/voltha-e2e/playground.yaml b/jjb/voltha-e2e/playground.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jjb/voltha-e2e/playground.yaml
+++ /dev/null
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
deleted file mode 100644
index 3d29c78..0000000
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ /dev/null
@@ -1,200 +0,0 @@
----
-# voltha 2.x tests
-# [NOTE]
-#   o md5sum(master) can be used to locate branch/release variants of a job.
-
-- project:
-    name: voltha-e2e-2.12
-
-    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.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          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: 'DEBUG'
-          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.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          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 * * *"
-
-      # -----------------------------------------------------------------------
-      # md5sum(master): c606493da6ee7cbb18ca8aee97ea2957
-      # -----------------------------------------------------------------------
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-2.12'
-          code-branch: 'voltha-2.12'
-          logLevel: 'DEBUG'                      # force job to regenerate
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          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
-            - target: onos-ha-test
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-multi-runs-2.12'
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          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
-
-      # -----------------------------------------------------------------------
-      # md5sum(master): eff05a324e94fdef076b2d5f7cb4f80f
-      # -----------------------------------------------------------------------
-      # https://www.lenar.io/jenkins-schedule-build-periodically/
-      # -----------------------------------------------------------------------
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-dt-test-bbsim-2.12'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'          
-          pipeline-script: 'voltha/bbsim-tests.groovy'
-          pipeline-branch: 'voltha-2.12'
-          code-branch: 'voltha-2.12'
-          time-trigger : '@daily'
-          # -----------------------------------------------------------------------
-          # time-trigger : "H/20 * * * *"   # every 20 min
-          #          time-trigger: "@hourly"
-          #          time-trigger: "@daily"
-          #          time-trigger: "@weekly"
-          #          time-trigger: "monthly"
-          # -----------------------------------------------------------------------
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master '
-          testTargets: |
-            - target: functional-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-failurescenarios-dt
-              workflow: dt
-              flags: ""
-              teardown: false
-              logging: true
-
-      # -----------------------------------------------------------------------
-      # md5sum(master): 6a1a43e203f8b5d4ad0c3d9f73116045
-      # -----------------------------------------------------------------------
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-dt-fttb-test-bbsim-2.12'
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'          
-          code-branch: 'VOLTHA-2.12'
-          time-trigger: "H H/23 * * *"
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
-          testTargets: |
-            - target: sanity-kind-dt-fttb
-              workflow: dt-fttb
-              flags: ""
-              teardown: true
-              logging: true
-
-# [EOF]
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 0f5e30a..82c03b6 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -373,213 +373,6 @@
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
       # -----------------------------------------------------------------------
-      # voltha-2.12 Jobs
-      # -----------------------------------------------------------------------
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.12-2-16-32-att-subscribers'
-          pipeline-script: 'voltha/voltha-2.12/voltha-scale-test.groovy'
-          pipeline-branch: 'voltha-2.12'
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          withEapol: true
-          withDhcp: true
-          withIgmp: false
-          release: voltha-2.12
-          karaf-home: 'apache-karaf-4.2.9'
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
-
-      # voltha-2.11 Jobs
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.11-2-16-32-att-subscribers'
-          pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
-          pipeline-branch: 'voltha-2.11'
-          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.11
-          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.12-2-16-32-dt-subscribers'
-          pipeline-script: 'voltha/voltha-2.12/voltha-scale-test.groovy'
-          pipeline-branch: 'voltha-2.12'
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          workflow: dt
-          withEapol: false
-          withDhcp: false
-          withIgmp: false
-          release: voltha-2.12
-          karaf-home: 'apache-karaf-4.2.9'
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: 'voltha/voltha-onos:5.0.4'
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
-
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.11-2-16-32-dt-subscribers'
-          pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
-          pipeline-branch: 'voltha-2.11'
-          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.11
-          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.12-2-16-32-tt-subscribers'
-          pipeline-script: 'voltha/voltha-2.12/voltha-scale-test.groovy'
-          pipeline-branch: 'voltha-2.12'
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          workflow: tt
-          withEapol: false
-          withDhcp: true
-          withIgmp: true
-          release: voltha-2.12
-          karaf-home: 'apache-karaf-4.2.9'
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
-
-      # -----------------------------------------------------------------------
-      # -----------------------------------------------------------------------
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-voltha-2.11-2-16-32-tt-subscribers'
-          pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
-          pipeline-branch: 'voltha-2.11'
-          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.11
-          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"
-
-      # -----------------------------------------------------------------------
-      # Multi-stack jobs
-      # -----------------------------------------------------------------------
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.12-10-stacks-2-16-32-att-subscribers'
-          build-node: 'voltha-scale-2'
-          pipeline-script: 'voltha/voltha-2.12/voltha-scale-multi-stack.groovy'
-          pipeline-branch: 'voltha-2.12'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          withMonitoring: false
-          logLevel: WARN
-          onosReplicas: 1
-          atomixReplicas: 0
-          kafkaReplicas: 1
-          etcdReplicas: 1
-          volthaStacks: 10
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          release: voltha-2.12
-          karaf-home: 'apache-karaf-4.2.9'
-          workflow: att
-          withEapol: true
-          withDhcp: true
-          withIgmp: false
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: 'voltha/voltha-onos:5.0.4'
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
-
-      # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       # 2.11 multi-stack jobs
       - 'voltha-scale-measurements':
@@ -619,42 +412,6 @@
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.12-10-stacks-2-16-32-dt-subscribers'
-          build-node: 'voltha-scale-2'
-          pipeline-script: 'voltha/voltha-2.12/voltha-scale-multi-stack.groovy'
-          pipeline-branch: 'voltha-2.12'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          withMonitoring: false
-          logLevel: WARN
-          onosReplicas: 1
-          atomixReplicas: 0
-          kafkaReplicas: 1
-          etcdReplicas: 1
-          volthaStacks: 10
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          release: voltha-2.12
-          karaf-home: 'apache-karaf-4.2.9'
-          workflow: dt
-          withEapol: false
-          withDhcp: false
-          withIgmp: false
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
-
-      # -----------------------------------------------------------------------
-      # -----------------------------------------------------------------------
-      - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-dt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
@@ -691,42 +448,6 @@
       # -----------------------------------------------------------------------
       # -----------------------------------------------------------------------
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-2.12-10-stacks-2-16-32-tt-subscribers'
-          build-node: 'voltha-scale-2'
-          pipeline-script: 'voltha/voltha-2.12/voltha-scale-multi-stack.groovy'
-          pipeline-branch: 'voltha-2.12'
-          time-trigger: "H H/4 * * *"
-          disable-job: true
-          withMonitoring: false
-          logLevel: WARN
-          onosReplicas: 1
-          atomixReplicas: 0
-          kafkaReplicas: 1
-          etcdReplicas: 1
-          volthaStacks: 10
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          release: voltha-2.12
-          karaf-home: 'apache-karaf-4.2.9'
-          workflow: tt
-          withEapol: false
-          withDhcp: true
-          withIgmp: true
-          bbsimImg: ''
-          rwCoreImg: ''
-          ofAgentImg: ''
-          openoltAdapterImg: ''
-          openonuAdapterImg: ''
-          openonuAdapterGoImg: ''
-          onosImg: ''
-          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
-
-      # -----------------------------------------------------------------------
-      # -----------------------------------------------------------------------
-      - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-tt-subscribers'
           build-node: 'voltha-scale-2'
           pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 36e1140..ceb9d06 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -317,61 +317,6 @@
                  H {time} * * *
 
 # -----------------------------------------------------------------------
-# VOLTHA Build Jobs (periodic: playground
-# [CORD_3256]
-# -----------------------------------------------------------------------
-- job-template:
-    name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}-playground'
-    id: build_voltha_pod_release_timer_playground
-    disabled: '{disable-job}'
-    description: |
-                  Manual Build on POD {config-pod}, using pipeline/{pipeline-script} in {gerrit-server-url}/ci-management'
-                  Created from job-template {id} from repo::ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml
-                  Copyright 2018-2024 Open Networking Foundation (ONF) and the ONF Contributors
-
-    <<: *voltha-pipe-job-boiler-plate
-    # default values
-    pipeline-script: 'voltha/playground/physical-build.groovy'
-    num-of-openonu: 1
-    num-of-onos: 3
-    num-of-atomix: 3
-    num-of-kafka: 3
-    num-of-etcd: 3
-    test-repo: 'voltha-system-tests'
-    release: 'master'
-    name-extension: ''
-    branch: 'master'
-    pipeline-branch: 'master'
-    configurePod: true
-    volthaHelmChartsChange: ''
-    profile: 'Default'
-    logLevel: 'DEBUG'
-    enableMultiUni: false
-    withFttb: false
-    uniPortMask: '0x0001'
-    bbsimReplicas: 0
-    num-of-onus: 0
-    num-of-ponports: 0
-    extraHelmFlags: ''
-
-    <<: *voltha-build-job-parameters
-
-    concurrent: true
-    project-type: pipeline
-    pipeline-scm:
-      scm:
-        - git:
-            url: https://gerrit.opencord.org/ci-management
-            branches:
-              - origin/{pipeline-branch}
-      script-path: jjb/pipeline/{pipeline-script}
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 H {time} * * *
-
-# -----------------------------------------------------------------------
 # VOLTHA Test Job
 # This job is automatically triggered after a build job has successfully completed
 # -----------------------------------------------------------------------
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 2b97cdb..bd13840 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -89,39 +89,6 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-dt-physical-functional-tests.groovy'
 
-      # -----------------------------------------------------------------------
-      # Berlin pod with gpon olt/onu - master 1T4GEM tech profile and timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'jenkins-worker-01.berlin-lab'
-          config-pod: 'berlin-community-pod-1-gpon-fttb'
-          cluster: 'pod-1.berlin-lab.lfbroadband.org'
-          disable-job: true
-          withFttb: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          profile: '1T4GEM-FTTB'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          time: '13'
-
-      # Berlin POD test job - master versions: uses 1T4GEM tech profile on voltha branch
-      - 'build_voltha_pod_test':
-          timeout: 330
-          build-node: 'jenkins-worker-01.berlin-lab'
-          config-pod: 'berlin-community-pod-1-gpon-fttb'
-          cluster: 'pod-1.berlin-lab.lfbroadband.org'
-          disable-job: true
-          withFttb: true
-          name-extension: '_DT'
-          work-flow: 'DT'
-          release: 'master'
-          branch: 'master'
-          pipeline-branch: 'master'
-          test-repo: 'voltha-system-tests'
-          profile: '1T4GEM-FTTB'
-          power-switch: true
-          pipeline-script: 'voltha/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: 'jenkins-worker-02.berlin-lab'
@@ -260,40 +227,6 @@
           profile: 'TP'
           timeout: 360
 
-      # TT workflow on Zyxel GPON OLT at Berlin pod - build job (playground)
-      - 'build_voltha_pod_release_timer_playground':
-          build-node: 'jenkins-worker-01.berlin-lab'
-          config-pod: 'berlin-community-pod-1-gpon'
-          cluster: 'pod-1.berlin-lab.lfbroadband.org'
-          disable-job: true
-          release: 'master'
-          branch: 'master'
-          pipeline-branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          profile: 'TP'
-          time: '10'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-
-      # TT workflow on Zyxel XGSPON OLT at Berlin pod - test job (playground)
-      - 'build_voltha_pod_test_playground':
-          build-node: 'jenkins-worker-01.berlin-lab'
-          config-pod: 'berlin-community-pod-1-gpon'
-          cluster: 'pod-1.berlin-lab.lfbroadband.org'
-          disable-job: true
-          release: 'master'
-          branch: 'master'
-          pipeline-branch: 'master'
-          name-extension: '_TT'
-          work-flow: 'TT'
-          power-switch: true
-          power-cycle-olt: false
-          pipeline-script: 'voltha/playground/voltha-tt-physical-functional-tests.groovy'
-          test-repo: 'voltha-system-tests'
-          profile: 'TP'
-          timeout: 360
-
       # Berlin pod with adtran gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'jenkins-worker-01.berlin-lab'
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
deleted file mode 100644
index c67d2df..0000000
--- a/jjb/xos-integration-tests.yaml
+++ /dev/null
@@ -1,252 +0,0 @@
----
-# xos-integration test jobs
-
-- project:
-    name: xos-integration-tests
-
-    project-name: 'xos-integration-tests'
-
-    jobs:
-      - 'data-model-scale':
-          'disable-job': true
-      - 'data-migrations'
-      - 'data-backup'
-      - 'att-wf'
-
-- job-template:
-    id: 'data-model-scale'
-    name: 'xos-data-model-scale'
-    disabled: '{disable-job}'
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/xos-integration-tests.yaml  <br /><br />
-
-    properties:
-      - 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: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu18.04-basebuild-8c-15g'          
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: manifestUrl
-          default: '{gerrit-server-url}/{cord-repo-manifest}'
-          description: 'URL to the repo manifest'
-
-      - string:
-          name: manifestBranch
-          default: 'master'
-          description: 'Name of the repo branch to use'
-
-      - string:
-          name: TestDir
-          default: 'xos-scale-tests'
-          description: 'Directory where tests reside'
-
-      - string:
-          name: TestCommand
-          default: 'robot -d Log -T -v xos_chameleon_url:127.0.0.1 -v xos_chameleon_port:30006 -v cord_kafka:\$CORD_KAFKA_IP -v num_olts:10 -v num_onus:1 -v num_pon_ports:10 -v timeout:360s xos-scale-att-workflow.robot'
-          description: 'Exact command to execute the tests including arguments'
-
-    project-type: pipeline
-    concurrent: false
-
-    dsl: !include-raw-escape: pipeline/xos-integration-tests.groovy
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 H 0,12 * * *
-
-- job-template:
-    id: 'data-migrations'
-    name: 'xos-data-migrations-test'
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/xos-integration-tests.yaml  <br /><br />
-
-    properties:
-      - 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: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu18.04-basebuild-8c-15g'          
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: manifestUrl
-          default: '{gerrit-server-url}/{cord-repo-manifest}'
-          description: 'URL to the repo manifest'
-
-      - string:
-          name: manifestBranch
-          default: 'master'
-          description: 'Name of the repo branch to use'
-
-      - string:
-          name: TestDir
-          default: 'xos-migration-tests'
-          description: 'Directory where tests reside'
-
-      - string:
-          name: TestCommand
-          default: 'robot -d Log -T -v helm_chart:$WORKSPACE/cord/helm-charts/xos-services/simpleexampleservice xos-remove-service.robot xos-service-migrations.robot'
-          description: 'Exact command to execute the tests including arguments'
-
-    project-type: pipeline
-    concurrent: false
-
-    dsl: !include-raw-escape: pipeline/xos-integration-tests.groovy
-
-    triggers:
-      - reverse:
-          jobs: 'docker-publish_xos'
-          result: 'success'
-
-- job-template:
-    id: 'data-backup'
-    name: 'xos-data-backup-test'
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/xos-integration-tests.yaml  <br /><br />
-
-    properties:
-      - 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: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu18.04-basebuild-8c-15g'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: manifestUrl
-          default: '{gerrit-server-url}/{cord-repo-manifest}'
-          description: 'URL to the repo manifest'
-
-      - string:
-          name: manifestBranch
-          default: 'master'
-          description: 'Name of the repo branch to use'
-
-      - string:
-          name: TestDir
-          default: 'xos-backup-tests'
-          description: 'Directory where tests reside'
-
-      - string:
-          name: TestCommand
-          default: 'robot -d Log -T xos-backup.robot'
-          description: 'Exact command to execute the tests including arguments'
-
-    project-type: pipeline
-    concurrent: false
-
-    dsl: !include-raw-escape: pipeline/xos-integration-tests.groovy
-
-    triggers:
-      - reverse:
-          jobs: 'docker-publish_xos'
-          result: 'success'
-
-- job-template:
-    id: 'att-wf'
-    name: 'att-workflow-validation-test'
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/xos-integration-tests.yaml  <br /><br />
-
-    properties:
-      - 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: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu18.04-basebuild-8c-15g'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: manifestUrl
-          default: '{gerrit-server-url}/{cord-repo-manifest}'
-          description: 'URL to the repo manifest'
-
-      - string:
-          name: manifestBranch
-          default: 'master'
-          description: 'Name of the repo branch to use'
-
-      - string:
-          name: service
-          default: 'att-workflow-driver'
-          description: 'Name of the service being tested'
-
-      - string:
-          name: helmChart
-          default: 'workflows/att-workflow'
-          description: 'Directory/name of the service helm-chart'
-
-      - string:
-          name: TestDir
-          default: 'xos-att-workflow-driver-tests'
-          description: 'Directory where tests reside'
-
-      - string:
-          name: TestCommand
-          default: 'robot -d Log -T -v server_ip:127.0.0.1 -v server_port:30006 -v cord_kafka:\$CORD_KAFKA_IP ATT_Workflow.robot'
-          description: 'Exact command to execute the tests including arguments'
-
-      - bool:
-          name: InstallService
-          default: true
-          description: 'Set to true when testing a particular xos-service'
-
-    project-type: pipeline
-    concurrent: false
-
-    dsl: !include-raw-escape: pipeline/xos-integration-tests.groovy
-
-    triggers:
-      - reverse:
-          jobs: 'docker-publish_att-workflow-driver'
-          result: 'success'
-
-# [EOF]