Update automated project templates

Change-Id: Ieca486a602db0b6b271321f4994c02e49b2f22b5
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 44c3a7506f8f5f45ce19309584a134a0a976096d..7808b1e0114be9f22deb0358a0cc7a769bf1a53e 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -27,7 +27,8 @@
     project: 'next'
 
 # For the Job templates below replace instances of:
-# PROJECT with your project name (eg. controller)
+# PROJECT_SHORTNAME with your project name (eg. circuitsw)
+# PROJECT_PATH with your project name (eg. ofextensions/circuitsw)
 # MAVEN_GOALS with your maven goals to build
 # MAVEN_OPTS with your maven options to build
 
@@ -88,6 +89,9 @@
     builders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
@@ -149,6 +153,9 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -214,6 +221,9 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -271,6 +281,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -330,12 +343,15 @@
 
     triggers:
         - reverse:
-            jobs: 'odlparent-merge-{stream}'
+            jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
             result: 'success'
 
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -350,7 +366,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[next] [odlparent]'
+            email-prefix: '[next] [odlparent] [controller] [yangtools]'
         - jacoco-report
 
 - job-template:
@@ -390,6 +406,9 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -444,6 +463,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
 
     maven:
         maven-name: '{mvn33}'