X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=85a63648171d0cd9f1d9928a3aef6999d39ddc76;hb=8251a4e78c9b6ebbfac30a144daf4f36cadf673d;hp=8b5d6960cbe098815ef464351be1204c0218e531;hpb=999c9c857dd34c4dd6d03e7a49286ad635109e36;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 8b5d6960c..85a636481 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -12,6 +12,7 @@
         - 'controller-integration-{stream}'
         - 'controller-sonar'
 
+
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
     stream:
@@ -39,10 +40,22 @@
     #     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
+                - openjdk8
+
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -72,16 +85,20 @@
             name: 'controller'
             branch: '{branch}'
 
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install -Pintegrationtests,docs'
-        maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{controller-settings}'
-        global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            settings: '{controller-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[controller]'
         - jacoco-report
@@ -128,15 +145,25 @@
             name: 'controller'
             branch: '{branch}'
 
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install -Pintegrationtests,docs source:jar javadoc:jar'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs source:jar javadoc:jar'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{controller-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
+        
         - email-notification:
             email-prefix: '[controller]'
         - maven-deploy:
@@ -185,14 +212,23 @@
     triggers:
         - timed: 'H H * * *'
 
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install -Pintegrationtests,docs'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs source:jar javadoc:jar'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{controller-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
         - email-notification:
             email-prefix: '[controller]'
@@ -241,21 +277,26 @@
             jobs: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
             result: 'success'
 
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install -Pintegrationtests,docs source:jar javadoc:jar'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs source:jar javadoc:jar'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{controller-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
         - email-notification:
             email-prefix: '[controller] [odlparent] [yangtools] [aaa]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
         - jacoco-report
 
 - job-template:
@@ -292,11 +333,17 @@
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install -Pintegrationtests,docs -Dsonar'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs -Dsonar'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{controller-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    reporters:
+        - findbugs
+
     publishers:
         - sonar:
             language: 'java'
@@ -304,3 +351,4 @@
         - email-notification:
             email-prefix: '[controller]'
         - jacoco-report
+