X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Feman%2Feman.yaml;h=36e06e98ad88be0388b7bfd66e3b5043e494c97f;hb=b0ee3dcc9ba7c94a5969548f7e818894e65b05d9;hp=14096267a27ddebe1a4ea074a02c00320ce1047b;hpb=b21ad700a8fefc412dead3d7800a80f1f1accd9c;p=releng%2Fbuilder.git

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 14096267a..36e06e98a 100644
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -1,27 +1,40 @@
 ---
+- project:
+    name: eman-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'eman'
+    project-name: 'eman'
+    branch: 'master'
+    mvn-settings: 'eman-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[eman]'
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-oxygen
     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'
     project-name: 'eman'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     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
@@ -30,25 +43,18 @@
     name: eman-nitrogen
     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'
     project-name: 'eman'
     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
@@ -57,26 +63,19 @@
     name: eman-carbon
     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'
     project-name: 'eman'
     branch: 'stable/carbon'
     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 +83,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'