Merge "Remove the need for mvn33 defaults"

[ci-management.git] / jjb / nsh_sfc / nsh_sfc.yaml

diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index eb80008..f812462 100644 (file)
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -67,7 +67,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'nsh_sfc-settings'
             settings-type: cfp
@@ -146,7 +146,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'nsh_sfc-settings'
             settings-type: cfp
@@ -259,6 +259,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -316,6 +318,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -324,7 +328,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -370,6 +374,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -394,7 +400,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp