Remove unused {maven} variable

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

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 14096267a27ddebe1a4ea074a02c00320ce1047b..d8f3f0749b9f12992c6ae91de3eb873f16f215af 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'eman'
@@ -13,15 +13,12 @@
     branch: 'master'
     jdks:
       - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -31,8 +28,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'eman'
@@ -40,15 +37,12 @@
     branch: 'stable/nitrogen'
     jdks:
       - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -58,8 +52,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'eman'
@@ -68,15 +62,12 @@
     karaf-version: karaf3
     jdks:
       - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: 96e9352979521
@@ -84,10 +75,9 @@
 - project:
     name: eman-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'eman'
     project-name: 'eman'
     branch: 'master'
     mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'