Update lispflowmapping to pull in changes from the CFG file

Change-Id: Ie09ec547c5ef2776218fcfab173f3946e8b95e64
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index d0041a3d0fdb6d8f158ef6fd601f18868385a5b1..ba8c9d7af70c5d138ce580065041f06e571f90fd 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -70,7 +70,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 javadoc:aggregate -DrepoBuild -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -125,7 +125,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 javadoc:aggregate -DrepoBuild -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -181,7 +181,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 javadoc:aggregate -DrepoBuild -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
@@ -196,7 +196,7 @@
 
 - job-template:
     name: 'lispflowmapping-integration-{stream}'
-    disabled: true
+    disabled: false
 
     # Job template for ODL merge jobs
     #
@@ -234,17 +234,17 @@
 
     triggers:
         - reverse:
-            jobs: ''
+            jobs: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
             result: 'success'
 
     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 javadoc:aggregate -DrepoBuild -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{lispflowmapping-settings}'
         global-settings: '{odl-global-settings}'
 
     publishers:
         - email-notification:
-            email-prefix: '[lispflowmapping]'
+            email-prefix: '[lispflowmapping] [controller] [odlparent] [yangtools]'