Remove unsupported Beryllium jobs

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

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index f3740a0572186dcd5eaa2bbf794f6613e51af8dc..a846568d8cd92124ec9bdf406a80488733cdc0aa 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: reservation-carbon
+    name: reservation-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: 'reservation'
     project-name: 'reservation'
     branch: 'master'
@@ -25,17 +25,18 @@
     archive-artifacts: ''
 
 - project:
-    name: reservation-boron
+    name: reservation-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: 'reservation'
     project-name: 'reservation'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -50,20 +51,20 @@
     archive-artifacts: ''
 
 - project:
-    name: reservation-beryllium
+    name: reservation-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: 'reservation'
     project-name: 'reservation'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: