Create a opendaylight-infra-wrapper macro

[releng/builder.git] / jjb-templates / periodic.yaml

diff --git a/jjb-templates/periodic.yaml b/jjb-templates/periodic.yaml
index 5e3510ac1ed3d2edec6029244aa69ea6143d143d..d8a6a0919e59bff2f56fa3693d2ce0501df69d58 100644 (file)
--- a/jjb-templates/periodic.yaml
+++ b/jjb-templates/periodic.yaml
@@ -1,5 +1,6 @@
 - job-template:
     name: 'PROJECT_SHORTNAME-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -15,8 +16,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -31,28 +32,27 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '@daily'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{JENKINS_SETTINGS}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'JENKINS_SETTINGS'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS -Djenkins'
+        goals: 'MAVEN_GOALS -V -B -Djenkins'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{JENKINS_SETTINGS}'
-        global-settings: '{odl-global-settings}'
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -61,3 +61,5 @@
         - email-notification:
             email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'