Migrate docs-rtd to archive-builds macro

[releng/builder.git] / jjb-templates / integration.yaml

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index 3862fb4850ced6c8e7bdf9ea5a5cc0063cbefdce..d7eec71e81bb29336b0512021b0ab691433f2306 100644 (file)
--- 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
@@ -27,14 +28,12 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -42,20 +41,27 @@
             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}'
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
-    postbuilders:
-        - jacoco-nojava-workaround
+    reporters:
+        - findbugs
 
     publishers:
         - email-notification:
             email-prefix: 'EMAIL_PREFIX'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'