Merge "Fix sdninterfaceapp MVN_GOALS override"

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

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 577b7b0d09330d6f89ea8fe04e89e2dcca4e030e..09f8ac1752cc187e02f232a793db5237f5932014 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -12,13 +12,12 @@
         - 'reservation-integration-{stream}'
         - 'reservation-sonar'
 
+
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
     stream:
         - master:
             branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
 
     project: 'reservation'
     jdk: 'openjdk7'
@@ -39,10 +38,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,17 +82,17 @@
             name: 'reservation'
             branch: '{branch}'
 
-    prebuilders:
+    builders:
         - wipe-org-opendaylight-repo
-
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo '
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{reservation-settings}'
-        global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
+        - 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: '{reservation-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
 
     publishers:
         - email-notification:
@@ -137,12 +147,16 @@
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo  source:jar javadoc:jar'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{reservation-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
     publishers:
+        
         - email-notification:
             email-prefix: '[reservation]'
         - maven-deploy:
@@ -197,13 +211,15 @@
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo  source:jar javadoc:jar'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{reservation-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
     publishers:
-        
         - email-notification:
             email-prefix: '[reservation]'
         - jacoco-report
@@ -257,18 +273,17 @@
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo  source:jar javadoc:jar'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{reservation-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
     publishers:
         - email-notification:
             email-prefix: '[reservation] [odlparent] [controller] [yangtools] [groupbasedpolicy]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
         - jacoco-report
 
 - job-template:
@@ -305,11 +320,14 @@
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo  -Dsonar'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{reservation-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
     publishers:
         - sonar:
             language: 'java'
@@ -317,3 +335,4 @@
         - email-notification:
             email-prefix: '[reservation]'
         - jacoco-report
+