X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freservation%2Freservation.yaml;h=1e32c5d215fb6df24902daf122591b8518a2d3cd;hb=fec89881ec40dd1f7d74bfc77e129784daf4ccde;hp=a89a6411d546cc43fd5db43d90d1943f2702fcee;hpb=0023b8933880f4e6428f1cc4a5445470116a9f7d;p=releng%2Fbuilder.git

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index a89a6411d..1e32c5d21 100644
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -1,21 +1,19 @@
+---
 - 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}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -23,24 +21,24 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - 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}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'reservation'
     project-name: 'reservation'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -48,25 +46,25 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - 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}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'reservation'
     project-name: 'reservation'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -74,10 +72,13 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'