Merge "Fix NSH_SFC linting"

[ci-management.git] / jjb / global-defaults.yaml

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 59c27bc..c1203c8 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -7,13 +7,9 @@
     build-num-to-keep: 40
     build-artifact-days-to-keep: -1
     build-artifact-num-to-keep: 5
+    # Timeout in minutes
+    build-timeout: 360
+    build-perf-timeout: 5760
 
-    ssh-credentials: 'jenkins-gerrit-credentials'
-
-    # Maven versions
-    mvn33: 'Maven_3.3.9'
-
-    # Config File provider ID mapping
-    global-settings: 'org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig1449593564219'
-    honeycomb-settings: 'bcd56fc8-76b4-4fa0-b2cd-c13bc5cdc527'
-    vpp-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1449593875850'
+    # fd.io branch defaults
+    branch: master