Merge "fuel, armband: basic healthcheck in verify jobs"

[releng.git] / jjb / global / releng-defaults.yml

diff --git a/jjb/global/releng-defaults.yml b/jjb/global/releng-defaults.yml
index bf33306..2e94767 100644 (file)
--- a/jjb/global/releng-defaults.yml
+++ b/jjb/global/releng-defaults.yml
@@ -1,21 +1,22 @@
+---
 # jjb defaults
 
 - defaults:
     name: global
 
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 200
-        artifactDaysToKeep: 30
-        artifactNumToKeep: 100
-
-    ssh-credentials: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+      - ssh-agent-wrapper
 
     project-type: freestyle
 
     node: master
 
+    properties:
+      - logrotate-default
+
+    publishers:
+      # Any project that has a publisher will not have this macro
+      # included due to the nature of JJB defaults. Projects will have
+      # to explicitly add this macro to their list of publishers in
+      # order for emails to be sent.
+      - email-jenkins-admins-on-failure