Merge "Add VTN to JJB"

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index b79e9e1221089bc9beb422f8acbae4dd58039d4f..8aae0d533b4ee5e98f29f5fd66c4235725ae28d9 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -72,6 +72,9 @@
             name: 'dlux'
             branch: '{branch}'
 
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
@@ -84,6 +87,7 @@
     publishers:
         - email-notification:
             email-prefix: '[dlux]'
+        - jacoco-report
 
 - job-template:
     name: 'dlux-merge-{stream}'
@@ -127,6 +131,9 @@
             name: 'dlux'
             branch: '{branch}'
 
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
@@ -142,6 +149,7 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+        - jacoco-report
 
 - job-template:
     name: 'dlux-daily-{stream}'
@@ -183,22 +191,26 @@
     triggers:
         - timed: 'H H * * *'
 
+    prebuilders:
+        - 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 '
+        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{dlux-settings}'
         global-settings: '{odl-global-settings}'
 
     publishers:
+        
         - email-notification:
             email-prefix: '[dlux]'
         - jacoco-report
 
 - job-template:
     name: 'dlux-integration-{stream}'
-    disabled: true
+    disabled: false
 
     # Job template for ODL merge jobs
     #
@@ -236,24 +248,28 @@
 
     triggers:
         - reverse:
-            jobs: ''
+            jobs: 'odlparent-merge-{stream}'
             result: 'success'
 
+    prebuilders:
+        - 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 '
+        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{dlux-settings}'
         global-settings: '{odl-global-settings}'
 
     publishers:
         - email-notification:
-            email-prefix: '[dlux]'
+            email-prefix: '[dlux] [odlparent]'
         - maven-deploy:
             id: ''
             unique-version: true
             deploy-unstable: false
+        - jacoco-report
 
 - job-template:
     name: 'dlux-sonar'
@@ -289,7 +305,7 @@
     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 '
+        goals: 'clean install -V -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo  -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{dlux-settings}'
         global-settings: '{odl-global-settings}'
@@ -300,3 +316,4 @@
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
             email-prefix: '[dlux]'
+        - jacoco-report