Remove all ODL Boron Jobs

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

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 950a74becf7ac64cab486754d5ae2665762b2f2e..2afdd2a72b9fbf490c6bd7c27b6d52f283effa93 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: persistence-nitrogen
+    name: persistence-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
@@ -26,43 +26,17 @@
     archive-artifacts: ''
 
 - project:
-    name: persistence-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/carbon'
-    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: ''
-
-- project:
-    name: persistence-boron
+    name: persistence-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/boron'
+    branch: 'stable/nitrogen'
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -78,17 +52,18 @@
     archive-artifacts: ''
 
 - project:
-    name: persistence-beryllium
+    name: persistence-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'persistence'
     project-name: 'persistence'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7