Update automated project templates

[releng/builder.git] / jjb / vpnservice / vpnservice.yaml

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index ba83d6c9419b4e6372d7af04c6fc39611f7ac17f..d6e000ac68cf755110e48a3d06e0ec005f91b022 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -32,7 +32,8 @@
     project: 'vpnservice'
 
 # 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
 
@@ -93,6 +94,9 @@
     builders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{vpnservice-settings}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
@@ -154,6 +158,9 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -219,6 +226,9 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -276,6 +286,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -335,12 +348,15 @@
 
     triggers:
         - reverse:
-            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream}'
+            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}'
             result: 'success'
 
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -355,7 +371,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[vpnservice] [controller] [yangtools] [odlparent] [openflowplugin]'
+            email-prefix: '[vpnservice] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
         - jacoco-report
 
 - job-template:
@@ -395,6 +411,9 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -449,6 +468,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'