Merge "[VOL-3813] Enable soak jobs and increase timer for DT nightly jobs"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 1d34e96..677dbf1 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -387,33 +387,6 @@
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
 
-     # Soak pod with xgs-pon olt/onu - master 1T4GEM tech profile and openonu go and timer based job
-      - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod-openonugo'
-          'disable-job': true
-          installBBSim: true
-          release: 'master'
-          branch: 'master'
-          name-extension: '_openonugo'
-          test-repo: 'voltha-system-tests'
-          Jenkinsfile: 'Jenkinsfile-voltha-build'
-          configurePod: true
-          profile: '1T4GEM'
-          time: '1'
-
-
-      # Soak POD test job - master versions, uses 1T4GEM tech profile and openonu go on voltha branch
-      - 'build_voltha_pod_test':
-          build-node: 'menlo-soak-pod'
-          config-pod: 'onf-soak-pod-openonugo'
-          'disable-job': true
-          name-extension: '_openonugo'
-          release: 'master'
-          branch: 'master'
-          test-repo: 'voltha-system-tests'
-          profile: '1T4GEM'
-
       # Menlo pod with olt/onu - Default tech profile and timer based job
       # ONF Menlo Soak POD build job - voltha-master branch
       # FIXME once the soak-pod is back use 'build_voltha_pod_release_timer'
@@ -421,6 +394,7 @@
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
           release: 'master'
+          installBBSim: true
           branch: 'master'
           profile: '1T8GEM'
           test-repo: 'voltha-system-tests'
@@ -448,7 +422,6 @@
       - 'build_voltha_pod_soak_test':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
-          'disable-job': true
           profile: '1T8GEM'
           branch: 'master'
           release: 'master'
@@ -464,7 +437,6 @@
       - 'build_voltha_pod_soak_test':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
-          'disable-job': true
           profile: '1T8GEM'
           branch: 'master'
           release: 'master'
@@ -480,7 +452,6 @@
       - 'build_voltha_pod_soak_test':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
-          'disable-job': true
           profile: '1T8GEM'
           branch: 'master'
           release: 'master'
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index a3f7083..c234f41 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -23,7 +23,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 340, unit: 'MINUTES')
+    timeout(time: 440, unit: 'MINUTES')
   }
 
   environment {