Merge "VPP: lowering build timeout to 120"

diff --combined jjb/vpp/vpp.yaml
index 4b5054e,fc2c19a..ce72e45
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -206,7 -206,7 +206,7 @@@
  
      wrappers:
          - fdio-infra-wrappers:
-             build-timeout: '{build-timeout}'
+             build-timeout: 120
  
      triggers:
          - gerrit-trigger-patch-merged:
@@@ -524,7 -524,7 +524,7 @@@
  
      wrappers:
          - fdio-infra-wrappers:
-             build-timeout: '{build-timeout}'
+             build-timeout: 120
  
      triggers:
          - gerrit-trigger-checkstyle:
@@@ -735,7 -735,7 +735,7 @@@
  
      wrappers:
          - fdio-infra-wrappers:
 -            build-timeout: '{build-timeout}'
 +            build-timeout: '90'
  
      triggers:
          - gerrit-trigger-checkstyle-nonvoting:
@@@ -766,6 -766,11 +766,6 @@@
          - fdio-infra-shiplogs:
              maven-version: 'mvn33-new'
  
 -        - naginator:
 -            rerun-unstable-builds: false
 -            max-failed-builds: 1
 -            fixed-delay: 90
 -
  - job-template:
      name: 'vpp-csit-verify-hw-perf-{stream}'