Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index c57615dfc08d21182199d69972a0a4cd1fea00f4..9af582ca7329fb4c776314c37588a0e01e1cf94c 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -2,25 +2,16 @@
 - project:
     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
@@ -28,25 +19,16 @@
 - project:
     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
@@ -54,26 +36,17 @@
 - project:
     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 +54,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'