Merge "Updated many of the tools"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index b0a1e1c..7580266 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -531,24 +531,24 @@
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
-     # Infosys pod with olt/onu - voltha-2.4 Default tech profile and timer based job
+     # Infosys pod with olt/onu - voltha-2.5 Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'infosys-test-pod'
           config-pod: 'infosys-pod'
-          release: '2.4'
-          branch: 'voltha-2.4'
+          release: '2.5'
+          branch: 'voltha-2.5'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: 'Default'
           time: '12'
 
-      # infosys test job - voltha-2.4 release job, uses Default tech profile on voltha branch
+      # infosys test job - voltha-2.5 release job, uses Default tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'infosys-test-pod'
           config-pod: 'infosys-pod'
-          release: '2.4'
-          branch: 'voltha-2.4'
+          release: '2.5'
+          branch: 'voltha-2.5'
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 9e91dea..1af8ca9 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -25,6 +25,24 @@
           openonuAdapterReplicas: 1
           openonuAdapterImg: voltha/voltha-openonu-adapter-go:master
           extraHelmFlags: '--set use_openonu_adapter_go=true'
+      - 'voltha-scale-measurements':
+          name: 'voltha-openonu-go-scale-measurements-master-2-16-32-dt-subscribers'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          onosReplicas: 3
+          atomixReplicas: 3
+          openonuAdapterReplicas: 1
+          openonuAdapterImg: voltha/voltha-openonu-adapter-go:master
+          extraHelmFlags: '--set use_openonu_adapter_go=true'
 
       # jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)
       - 'voltha-scale-measurements':