X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpersistence%2Fpersistence.yaml;h=c745e21788534770c48f7cf972302ff03db62e65;hb=9712aebd07d323d91d7e9f7f1392ae7768338644;hp=6342cc935b363e9503ae6e10a3f0b458a5fbf673;hpb=179eb6fdb7167a2c4a5d36226a72f1ed2adcd5bc;p=releng%2Fbuilder.git

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 6342cc935..c745e2178 100644
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,28 +1,36 @@
 ---
+- project:
+    name: persistence-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'persistence'
+    project-name: 'persistence'
+    branch: 'master'
+    jdk: openjdk7
+    mvn-settings: 'persistence-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[persistence]'
+
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
     name: persistence-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'master'
+    branch: 'stable/oxygen'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
@@ -30,27 +38,17 @@
 - project:
     name: persistence-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/nitrogen'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
@@ -58,9 +56,7 @@
 - project:
     name: persistence-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'persistence'
@@ -68,18 +64,10 @@
     branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
@@ -87,10 +75,9 @@
 - project:
     name: persistence-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'