Merge "Java 8 for CSIT jobs."

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

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index 7edf18a5c5ff48c4c38ce3a1edf5d800fad064bc..d92cc0ea1069c8b19c1bc4623c48e0a2379d89b4 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
@@ -37,18 +37,21 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: 'H H * * 7'
 
     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'
+        goals: 'MAVEN_GOALS -Djenkins'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
     reporters:
@@ -56,5 +59,5 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report