X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fintegration.yaml;h=d7eec71e81bb29336b0512021b0ab691433f2306;hb=refs%2Fchanges%2F24%2F41424%2F3;hp=deed83ae9aed8dd519899a289c927eaa77b68095;hpb=c384df13b66a9446af523ed062f6879487f0d8f9;p=releng%2Fbuilder.git

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index deed83ae9..d7eec71e8 100644
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-integration-{stream}'
+    name: 'PROJECT_SHORTNAME-integration-{stream}'
     disabled: DISABLED
 
     # Job template for ODL integration verify jobs
@@ -9,8 +9,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
@@ -28,15 +28,12 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -44,18 +41,20 @@
             result: 'success'
 
     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}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS source:jar javadoc:jar'
+        goals: 'MAVEN_GOALS -V -B -Djenkins'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
-        global-settings: '{odl-global-settings}'
-
-    postbuilders:
-        - jacoco-nojava-workaround
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -64,3 +63,5 @@
         - email-notification:
             email-prefix: 'EMAIL_PREFIX'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'