Moving the scale job for a single ONU to perform the full scenario

Change-Id: Ib28c0ba73d59fcfaf470c0bac995039acc2989fd
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 574adc7..3427aef 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -84,13 +84,17 @@
           expectedOnus: 64
           BBSIMdelay: 200
       - 'voltha-scale-measurements-periodic':
-          name: 'voltha-scale-measurements-periodic-1-1-200ms'
+          name: 'voltha-scale-measurements-periodic-1-1-200ms-complete'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           onuPerPon: 1
           ponPorts: 1
           expectedOnus: 1
           BBSIMdelay: 200
+          withOnosApps: true
+          flowStatInterval: 5
+          portsStatInterval: 5
+          expectedFlows: 2
       - 'voltha-scale-measurements-periodic':
           name: 'voltha-scale-measurements-periodic-2-OLTs-10-10-200ms'
           build-node: 'onf-pod1-head-node'
@@ -115,7 +119,7 @@
           bbsimAuth: false
           bbsimDhcp: false
       - 'voltha-scale-measurements-periodic':
-          name: 'voltha-scale-measurements-periodic-10-20-200ms-complete'
+          name: 'voltha-scale-measurements-periodic-4-16-200ms-complete'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
           onuPerPon: 16
@@ -126,6 +130,18 @@
           flowStatInterval: 5
           portsStatInterval: 5
           expectedFlows: 65
+      - 'voltha-scale-measurements-periodic':
+          name: 'voltha-scale-measurements-periodic-10-20-200ms-complete'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          onuPerPon: 20
+          ponPorts: 10
+          expectedOnus: 64
+          BBSIMdelay: 200
+          withOnosApps: true
+          flowStatInterval: 5
+          portsStatInterval: 5
+          expectedFlows: 201
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-dev'
           build-node: 'voltha-scale'