Merge "Use integration-patch-refspec in integration-python template"

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

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index 286b806ef4a2cad79dd82854ff5a179f4f34696f..ad9998ace5ae6219d046e9b79a647a32140049c7 100644 (file)
--- 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
@@ -41,22 +41,23 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         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