Remove unsupported Beryllium jobs

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

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index e8b145559f4f3f572dfe5fc7dcc5811a9a0c73cc..25dc63a15a572cbf4cd08350d38aaf11ab377583 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: discovery-carbon
+    name: discovery-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'discovery'
     project-name: 'discovery'
     branch: 'master'
@@ -25,17 +25,18 @@
     archive-artifacts: ''
 
 - project:
-    name: discovery-boron
+    name: discovery-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'discovery'
     project-name: 'discovery'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -50,17 +51,18 @@
     archive-artifacts: ''
 
 - project:
-    name: discovery-beryllium
+    name: discovery-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'discovery'
     project-name: 'discovery'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7