X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fdaily.yaml;h=ad9998ace5ae6219d046e9b79a647a32140049c7;hb=ddc7458e60c788c7ff95f73b4f532c877be3c85a;hp=3a1e3fa7f022535de3c1fbf4f8a71e816f03d7ce;hpb=b1778c91dcc04d8cc5d927a5d31959bb80365355;p=releng%2Fbuilder.git

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index 3a1e3fa7f..ad9998ace 100644
--- a/jjb-templates/daily.yaml
+++ b/jjb-templates/daily.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-daily-{stream}'
+    name: 'PROJECT_SHORTNAME-daily-{stream}'
 
     # Job template for daily builders
     #
@@ -7,8 +7,8 @@
     # builder and pushes to Sonar analysis.
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
     node: dynamic_verify
@@ -33,26 +33,31 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: 'H H * * *'
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS source:jar javadoc:jar'
+        goals: 'MAVEN_GOALS'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
+    reporters:
+        - findbugs
 
     publishers:
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report