X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flispflowmapping%2Flispflowmapping.yaml;h=582621eeca1d1209d84b9b5fa1673bbfbab1fe71;hb=fec89881ec40dd1f7d74bfc77e129784daf4ccde;hp=75cc13b69f21601051e093c5f0c2428c875b99af;hpb=cf99d02958ff4fb47109900c319ba0fad0f684e6;p=releng%2Fbuilder.git

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 75cc13b69..582621eec 100644
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'lispflowmapping'
@@ -26,7 +25,7 @@
         **/*.log
         **/target/surefire-reports/*-output.txt
 
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
@@ -36,9 +35,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'lispflowmapping'
@@ -54,8 +52,11 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
@@ -65,9 +66,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'lispflowmapping'
@@ -85,7 +85,7 @@
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766