Extended timeout for some bbsim based jobs as workaround for ONOS connection issue

Change-Id: Ia4c304ac17c0c9e087f6bbd34731621fe0e450b3
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index a6d76cc..07627c4 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -181,7 +181,7 @@
               flags: ""
               teardown: false
               logging: true
-          timeout: 210
+          timeout: 360
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-test-bbsim-2.8'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index fbd01a2..0127f04 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -66,7 +66,7 @@
           extraHelmFlags: '--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn'
 
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-onu-upgrade-2-16-32-att-subscribers'
+          name: 'voltha-scale-measurements-master-onu-upgrade-2-16-32-att-onus'
           'disable-job': false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/12 * * *"