Merge "Adding builds to voltha-scale-measurements (1x1 and 8x48)"
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 687c5fb..aa39641 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -10,7 +10,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-8-32-200ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 32
           ponPorts: 8
           expectedOnus: 256
@@ -18,15 +18,31 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-8-32-1000ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 32
           ponPorts: 8
           expectedOnus: 256
           BBSIMdelay: 1000
       - 'voltha-scale-measurements-periodic':
+          name: 'voltha-scale-measurements-periodic-8-48-200ms'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          onuPerPon: 48
+          ponPorts: 8
+          expectedOnus: 384
+          BBSIMdelay: 200
+      - 'voltha-scale-measurements-periodic':
+          name: 'voltha-scale-measurements-periodic-8-48-1000ms'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          onuPerPon: 48
+          ponPorts: 8
+          expectedOnus: 384
+          BBSIMdelay: 1000
+      - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-4-32-200ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 32
           ponPorts: 4
           expectedOnus: 128
@@ -34,7 +50,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-4-32-1000ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 32
           ponPorts: 4
           expectedOnus: 128
@@ -42,7 +58,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-16-32-200ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 32
           ponPorts: 16
           expectedOnus: 512
@@ -50,7 +66,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-16-32-1000ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 32
           ponPorts: 16
           expectedOnus: 512
@@ -58,7 +74,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-4-64-200ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 64
           ponPorts: 4
           expectedOnus: 256
@@ -66,7 +82,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-4-64-1000ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 64
           ponPorts: 4
           expectedOnus: 256
@@ -74,7 +90,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-4-128-200ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 128
           ponPorts: 4
           expectedOnus: 512
@@ -82,7 +98,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-4-128-1000ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 128
           ponPorts: 4
           expectedOnus: 512
@@ -90,7 +106,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-1-128-200ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 128
           ponPorts: 1
           expectedOnus: 128
@@ -98,7 +114,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-1-128-1000ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 128
           ponPorts: 1
           expectedOnus: 128
@@ -106,7 +122,7 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-1-64-200ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 64
           ponPorts: 1
           expectedOnus: 64
@@ -114,11 +130,27 @@
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-1-64-1000ms'
           build-node: 'onf-pod1-head-node'
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/4 * * *"
           onuPerPon: 64
           ponPorts: 1
           expectedOnus: 64
           BBSIMdelay: 1000
+      - 'voltha-scale-measurements-periodic':
+          name: 'voltha-scale-measurements-periodic-1-1-200ms'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          onuPerPon: 1
+          ponPorts: 1
+          expectedOnus: 1
+          BBSIMdelay: 200
+      - 'voltha-scale-measurements-periodic':
+          name: 'voltha-scale-measurements-periodic-1-1-1000ms'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          onuPerPon: 1
+          ponPorts: 1
+          expectedOnus: 1
+          BBSIMdelay: 1000
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-dev'
           build-node: 'voltha-scale-dev'