Merge changes from topic 'RELENG-704'

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

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index de70c4f65decad866651f3ccc8c7b28f9fca3fff..238608123640688f39ab84a57b87646ed7961303 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -5,6 +5,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
 
     stream: oxygen
@@ -22,7 +23,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-8g
+    build-node: centos7-java-builder-2c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
@@ -33,6 +34,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
 
     stream: nitrogen
@@ -50,7 +52,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-8g
+    build-node: centos7-java-builder-2c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
@@ -61,6 +63,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
 
     stream: carbon
@@ -79,7 +82,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-8g
+    build-node: centos7-java-builder-2c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
@@ -87,7 +90,7 @@
 - project:
     name: lispflowmapping-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'