Update Ubuntu docker image

[releng/builder.git] / jjb / persistence / persistence.yaml

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 0c0db87cfd5979b7c4deda80c5ef9052b835ff30..c745e21788534770c48f7cf972302ff03db62e65 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,27 +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'
+      - 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
@@ -29,26 +38,17 @@
 - project:
     name: persistence-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - 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
@@ -56,8 +56,7 @@
 - project:
     name: persistence-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'persistence'
@@ -65,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
@@ -89,5 +80,4 @@
     project-name: 'persistence'
     branch: 'master'
     mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'