X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcentinel%2Fcentinel.yaml;h=71d0b5cedeaf6b1e9e3b307c04c7aaa79a274e88;hb=ee4cb5fac77356c36742471b5f9b4593fcd38e6e;hp=e9d0f32f9262c278d4fe182d7fa06867fe6707bd;hpb=50ba79850e9238b1c99e961f5aae24d58c50c117;p=releng%2Fbuilder.git

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index e9d0f32f9..71d0b5ced 100644
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -1,27 +1,35 @@
 ---
+- project:
+    name: centinel-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'centinel'
+    project-name: 'centinel'
+    branch: 'master'
+    mvn-settings: 'centinel-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[centinel]'
+
+    # Used by the release job
+    staging-profile-id: 96bf9b3fefd8a
+
 - project:
     name: centinel-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'centinel'
     project-name: 'centinel'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
@@ -30,25 +38,16 @@
     name: centinel-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
@@ -57,26 +56,17 @@
     name: centinel-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
@@ -84,11 +74,10 @@
 - project:
     name: centinel-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'centinel'
     project-name: 'centinel'
     branch: master
     mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'