Merge "Remove neutron carbon jobs"

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

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 8d00a247da47406b5242d097fddb64cbbb5f158e..f9b73e441aee77b7b7bad599411fa7bef9044e0f 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: persistence-oxygen
+    name: persistence-fluorine
     jobs:
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
@@ -18,14 +18,14 @@
     staging-profile-id: a68d3c2bb44d1
 
 - project:
-    name: persistence-nitrogen
+    name: persistence-oxygen
     jobs:
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     jdk: openjdk7
     mvn-settings: 'persistence-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -36,15 +36,14 @@
     staging-profile-id: a68d3c2bb44d1
 
 - project:
-    name: persistence-carbon
+    name: persistence-nitrogen
     jobs:
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     jdk: openjdk7
     mvn-settings: 'persistence-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'