X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flispflowmapping%2Flispflowmapping.yaml;h=7cf81c3a577d6f42c2cdc5ab119eae09a793309f;hb=b1778c91dcc04d8cc5d927a5d31959bb80365355;hp=74fbba3c594eca0398314328c91ad8e7c361e981;hpb=c64acc964db217a4e4c49ca1d0bdab9749b398f5;p=releng%2Fbuilder.git

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 74fbba3c5..7cf81c3a5 100644
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -12,6 +12,7 @@
         - 'lispflowmapping-integration-{stream}'
         - 'lispflowmapping-sonar'
 
+
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
     stream:
@@ -39,10 +40,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}'
@@ -72,19 +84,16 @@
             name: 'lispflowmapping'
             branch: '{branch}'
 
-    prebuilders:
+    builders:
         - wipe-org-opendaylight-repo
-
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{lispflowmapping-settings}'
-        global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{lispflowmapping-settings}'
+            global-settings: '{odl-global-settings}'
         - jacoco-nojava-workaround
 
     publishers:
@@ -257,7 +266,7 @@
 
     triggers:
         - reverse:
-            jobs: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+            jobs: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
             result: 'success'
 
     prebuilders:
@@ -276,11 +285,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[lispflowmapping] [controller] [odlparent] [yangtools]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
+            email-prefix: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
         - jacoco-report
 
 - job-template:
@@ -332,3 +337,4 @@
         - email-notification:
             email-prefix: '[lispflowmapping]'
         - jacoco-report
+