X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fintegration.yaml;h=97d1aa89e57d1048bf3393fbf9712e84d9844098;hb=5450985ba9905da13e194cf4f482a07b7cc656b2;hp=d0f8b6b59dfa04e2b4bb7f394191ce57ad68ca25;hpb=59df98b79d9d2787df0c083467c04f21a4eb0c48;p=releng%2Fbuilder.git

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index d0f8b6b59..97d1aa89e 100644
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -1,15 +1,16 @@
 - job-template:
-    name: 'PROJECT-integration-{stream}'
+    name: 'PROJECT_SHORTNAME-integration-{stream}'
     disabled: DISABLED
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # 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
@@ -34,7 +35,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - reverse:
@@ -43,23 +45,23 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: 'MAVEN_GOALS source:jar javadoc:jar'
+        maven-name: '{mvn33}'
+        root-pom: 'POM'
+        goals: 'MAVEN_GOALS -Djenkins'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
+    reporters:
+        - findbugs
 
     publishers:
         - email-notification:
             email-prefix: 'EMAIL_PREFIX'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
         - jacoco-report