Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index d2a4240e7665fc05010790b5bf301ad8ef96421c..e6fdae19957941865b802af7bbd649d7d28b6746 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -3,25 +3,16 @@
     name: capwap-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
@@ -30,25 +21,16 @@
     name: capwap-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
@@ -57,26 +39,17 @@
     name: capwap-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
@@ -84,11 +57,10 @@
 - project:
     name: capwap
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'capwap'
     project-name: 'capwap'
     branch: master
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'