Merge "Switch all projects to use new maven-merge job"

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

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 14096267a27ddebe1a4ea074a02c00320ce1047b..f889912ee04b09af05ed6dfb6d5ce5f5a10e3346 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -5,7 +5,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
 
     stream: oxygen
     project: 'eman'
@@ -22,6 +22,7 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -32,7 +33,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
 
     stream: nitrogen
     project: 'eman'
@@ -49,6 +50,7 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -59,7 +61,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
 
     stream: carbon
     project: 'eman'
@@ -77,6 +79,7 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -84,7 +87,7 @@
 - project:
     name: eman-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'eman'
     project-name: 'eman'
     branch: 'master'