X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freservation%2Freservation.yaml;h=af4ffd6599cc55e98a564d842899ee4543739b71;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=c57615dfc08d21182199d69972a0a4cd1fea00f4;hpb=d6c6bb7136720d8ff3a46134b5e9216c3281777c;p=releng%2Fbuilder.git

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index c57615dfc..af4ffd659 100644
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -3,24 +3,16 @@
     name: reservation-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
-    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: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
@@ -29,24 +21,16 @@
     name: reservation-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/nitrogen'
-    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: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
@@ -55,25 +39,17 @@
     name: reservation-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    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: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
@@ -81,10 +57,9 @@
 - project:
     name: reservation-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'