X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcoe%2Fcoe.yaml;h=117d2be80bdc75b121121ca1136521dbb07f3b2b;hb=26b7d0bb57c0add170d1bebad45b73e6b9429d1e;hp=eba49dffaa816d7d8fc32b41e8ff68e1d68af232;hpb=80f1c7fe40cc0b4cc727dc57bf7f98ef4be6d464;p=releng%2Fbuilder.git

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index eba49dffa..117d2be80 100644
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,27 +1,38 @@
 ---
+- project:
+    name: coe-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: fluorine
+    branch: 'master'
+    mvn-settings: 'coe-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
     stream: oxygen
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
+    build-node: centos7-docker-2c-8g
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
@@ -30,25 +41,16 @@
     name: coe-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
@@ -56,26 +58,17 @@
 - project:
     name: coe-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
@@ -83,11 +76,10 @@
 - project:
     name: coe-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'coe'
     project-name: 'coe'
     branch: 'master'
     mvn-settings: 'coe-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'