Update automated project templates

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

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 86122e8627086ceb2487ca887bd962bad9df5301..d6e000ac68cf755110e48a3d06e0ec005f91b022 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -15,10 +15,10 @@
         - 'vpnservice-clm-{stream}'
 
 
-    # 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)
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
             jdk: openjdk7
             jdks:
@@ -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
 
@@ -44,8 +45,8 @@
     # The purpose of this job template is to setup a ODL verify job
     #
     # 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: matrix
     node: matrix_master
@@ -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'
@@ -117,8 +121,8 @@
     # and deploy artifacts to Nexus.
     #
     # 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_merge
@@ -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}'
@@ -184,8 +191,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
@@ -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}'
@@ -239,6 +249,10 @@
 - job-template:
     name: 'vpnservice-distribution-{stream}'
 
+    # Required variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+
     project-type: maven
     node: dynamic_merge
     jdk: '{jdk}'
@@ -272,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}'
@@ -300,8 +317,8 @@
     # is successfully built.
     #
     # 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_merge
@@ -331,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}'
@@ -351,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:
@@ -385,10 +405,15 @@
 
     triggers:
         - timed: 'H H * * *'
+        - gerrit-trigger-patch-sonar:
+            name: 'vpnservice'
 
     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}'
@@ -443,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}'