Merge "enabling rest api config perf tests for jenkinst usage"

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index ecca30d8de82846eb7c804b27fe29a9d6a96d9ae..c821289042274788fe04258c30651490cd3669fc 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -20,6 +20,8 @@
             branch: 'master'
         - stable-helium:
             branch: 'stable/helium'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'odlparent'
     jdk: 'openjdk7'
@@ -40,10 +42,21 @@
     #     stream:    branch with - in place of / (eg. stable-helium)
     #     branch:    branch (eg. stable/helium)
 
-    project-type: maven
-    node: dynamic_verify
+    project-type: matrix
+    node: matrix_master
     concurrent: true
-    jdk: '{jdk}'
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values:
+                - openjdk7
+
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -73,19 +86,16 @@
             name: 'odlparent'
             branch: '{branch}'
 
-    prebuilders:
+    builders:
         - wipe-org-opendaylight-repo
-
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{odlparent-settings}'
-        global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{odlparent-settings}'
+            global-settings: '{odl-global-settings}'
         - jacoco-nojava-workaround
 
     publishers:
@@ -149,6 +159,9 @@
     postbuilders:
         - jacoco-nojava-workaround
 
+    reporters:
+        - findbugs
+
     publishers:
         
         - email-notification:
@@ -213,6 +226,9 @@
     postbuilders:
         - jacoco-nojava-workaround
 
+    reporters:
+        - findbugs
+
     publishers:
         - email-notification:
             email-prefix: '[odlparent]'
@@ -275,6 +291,9 @@
     postbuilders:
         - jacoco-nojava-workaround
 
+    reporters:
+        - findbugs
+
     publishers:
         - email-notification:
             email-prefix: '[odlparent] [odlparent]'
@@ -322,6 +341,9 @@
     postbuilders:
         - jacoco-nojava-workaround
 
+    reporters:
+        - findbugs
+
     publishers:
         - sonar:
             language: 'java'