Merge "VPP: arm timeout to 120 minutes"

diff --cc jjb/vpp/vpp.yaml
index 43c20b2,fe5900c..7da9e38
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -288,10 -288,10 +288,10 @@@
  
      wrappers:
          - fdio-infra-wrappers:
-             build-timeout: '{build-timeout}'
+             build-timeout: 120
  
      triggers:
 -        - gerrit-trigger-checkstyle:
 +        - gerrit-trigger-checkstyle-nonvoting:
              name: '{project}'
              branch: '{branch}'