Create a opendaylight-infra-wrapper macro

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

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index 68c91c8eb69808ecb4b593a285786cb66e4431d4..5701c79ba120386cd37a96276eee707df28b8bf2 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -1,9 +1,6 @@
 - job-template:
     name: 'PROJECT_SHORTNAME-integration-{stream}'
-    # Temporarily disable this job until Rackspace networking issues are
-    # resolved.
-    #disabled: DISABLED
-    disabled: true
+    disabled: DISABLED
 
     # Job template for ODL integration verify jobs
     #
@@ -36,10 +33,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -47,19 +42,20 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{JENKINS_SETTINGS}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'JENKINS_SETTINGS'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS -Djenkins'
+        goals: 'MAVEN_GOALS -V -B -Djenkins'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{JENKINS_SETTINGS}'
-        global-settings: '{odl-global-settings}'
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -68,3 +64,5 @@
         - email-notification:
             email-prefix: 'EMAIL_PREFIX'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'