Remove mvn-goals for projects that use default

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

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index c57615dfc08d21182199d69972a0a4cd1fea00f4..e54d68836097bd04bb3b1742cb827801ea47a12d 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -3,8 +3,7 @@
     name: reservation-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'reservation'
@@ -16,7 +15,6 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
@@ -29,8 +27,7 @@
     name: reservation-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'reservation'
@@ -42,7 +39,6 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
@@ -55,8 +51,7 @@
     name: reservation-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'reservation'
@@ -69,7 +64,6 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
@@ -81,10 +75,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'