X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Feman%2Feman.yaml;h=f889912ee04b09af05ed6dfb6d5ce5f5a10e3346;hb=63ecbdec7e9b945d75d5a4476571dba63a832590;hp=5c270437c2b1a3149bf12d98ae02c90b3051cc0d;hpb=26c20ade21e2629099602ca890b9a67f2b9a2586;p=releng%2Fbuilder.git

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 5c270437c..f889912ee 100644
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -2,17 +2,15 @@
 - project:
     name: eman-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
 
     stream: oxygen
     project: 'eman'
     project-name: 'eman'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -24,21 +22,23 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96e9352979521
 
 - project:
     name: eman-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
 
     stream: nitrogen
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -50,22 +50,24 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96e9352979521
 
 - project:
     name: eman-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
 
     stream: carbon
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -77,38 +79,15 @@
     dependencies: ''
     email-upstream: '[eman]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
-- project:
-    name: eman-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    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: ''
+    # Used by the release job
+    staging-profile-id: 96e9352979521
 
 - project:
     name: eman-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'eman'
     project-name: 'eman'
     branch: 'master'