Update automated project templates

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

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 1c313d7856e45e6ad5ada24485df7c6bff604cd8..d6e000ac68cf755110e48a3d06e0ec005f91b022 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -96,7 +96,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{vpnservice-settings}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
@@ -160,7 +160,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -228,7 +228,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -288,7 +288,7 @@
         - wipe-org-opendaylight-repo
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -348,7 +348,7 @@
 
     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:
@@ -356,7 +356,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -371,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:
@@ -413,7 +413,7 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -470,7 +470,7 @@
         - wipe-org-opendaylight-repo
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{vpnservice-settings}'
 
     maven:
         maven-name: '{mvn33}'