Merge "Update AR projects with all file types to log"

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

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index f3740a0572186dcd5eaa2bbf794f6613e51af8dc..46f5d75a666fe9cea014c253040c0b13d61620fd 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: reservation-carbon
+    name: reservation-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: oxygen
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
@@ -25,17 +25,17 @@
     archive-artifacts: ''
 
 - project:
-    name: reservation-boron
+    name: reservation-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: 'reservation'
     project-name: 'reservation'
-    branch: 'stable/boron'
+    branch: 'stable/nitrogen'
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -50,20 +50,46 @@
     archive-artifacts: ''
 
 - project:
-    name: reservation-beryllium
+    name: reservation-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: 'reservation'
     project-name: 'reservation'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'reservation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[reservation]'
+    archive-artifacts: ''
+
+- project:
+    name: reservation-boron
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: boron
+    project: 'reservation'
+    project-name: 'reservation'
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: