Merge "Do not skip commit-message-only checkstyle"

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

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 87c10fe..93bf6cc 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -1,3 +1,4 @@
+---
 # GLOBAL jenkins defaults
 
 - defaults:
@@ -7,5 +8,18 @@
     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'
+    # global-jjb
+    gerrit-server-name: Primary
+    jenkins-ssh-credential: jenkins-gerrit-credentials
+    lftools-version: <1.0.0
+    archive-artifacts: ''
+
+    # fd.io branch defaults
+    branch: master
+
+    # voting
+    skip-vote: false
\ No newline at end of file